diff --git a/erpnext/locale/ar.po b/erpnext/locale/ar.po
index 465572fc20b..1738efa7501 100644
--- a/erpnext/locale/ar.po
+++ b/erpnext/locale/ar.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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:09\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:05\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Arabic\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr ""
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr "يجب أن تكون \"الأيام منذ آخر طلب\" أكبر من
msgid "'Default {0} Account' in Company {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr "المدخلات لا يمكن أن تكون فارغة"
@@ -840,11 +840,11 @@ msgstr ""
msgid "Your Shortcuts"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr ""
@@ -1215,10 +1215,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1523,7 +1523,7 @@ msgstr "الحساب {0}: الحسابه الأب {1} غير موجود"
msgid "Account {0}: You can not assign itself as parent account"
msgstr "الحساب {0}: لا يمكنك جعله حساب رئيسي"
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr "الحساب: {0} عبارة "Capital work" قيد التقدم ولا يمكن تحديثها بواسطة "إدخال دفتر اليومية""
@@ -2012,7 +2012,7 @@ msgstr "الحسابات المجمدة حتى تاريخ"
msgid "Accounts Manager"
msgstr "مدير حسابات"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr ""
@@ -2199,7 +2199,7 @@ msgstr "إعدادات الحسابات"
msgid "Accounts User"
msgstr "حسابات المستخدمين"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr "جدول الحسابات لا يمكن أن يكون فارغا."
@@ -2559,6 +2559,10 @@ msgstr "الفعلي وقت الانتهاء"
msgid "Actual Expense"
msgstr ""
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr ""
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2696,7 +2700,7 @@ msgstr "إضافة و تعديل الأسعار"
msgid "Add Child"
msgstr "إضافة الطفل"
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr ""
@@ -3502,7 +3506,7 @@ msgstr "المبلغ مقدما"
msgid "Advance amount cannot be greater than {0} {1}"
msgstr "قيمة الدفعة المقدمة لا يمكن أن تكون أكبر من {0} {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr ""
@@ -3559,7 +3563,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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr "مقابل الحساب"
@@ -3628,7 +3632,7 @@ msgstr "مقابل حساب المصاريف"
msgid "Against Income Account"
msgstr "مقابل حساب الدخل"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr "قيد اليومية المقابل {0} لا يحتوى مدخل {1} غير مطابق\\n
\\nAgainst Journal Entry {0} does not have any unmatched {1} entry"
@@ -3676,7 +3680,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr "مقابل إيصال"
@@ -3688,7 +3692,7 @@ msgstr "مقابل إيصال"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr ""
@@ -3700,8 +3704,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr "مقابل إيصال نوع"
@@ -3827,7 +3831,7 @@ msgstr "الكل"
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr "جميع الحسابات"
@@ -3995,7 +3999,7 @@ msgstr ""
msgid "All items have already been Invoiced/Returned"
msgstr "تم بالفعل تحرير / إرجاع جميع العناصر"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr ""
@@ -4021,7 +4025,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:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr "تم بالفعل إصدار فاتورة / إرجاع جميع هذه العناصر"
@@ -4907,7 +4911,7 @@ msgstr "معدل من"
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5047,7 +5051,7 @@ msgstr "المبلغ في الشكل"
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr ""
@@ -5198,7 +5202,7 @@ msgstr "سجل الموازنة الآخر '{0}' موجود بالفعل
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr ""
@@ -5781,7 +5785,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5823,7 +5827,7 @@ msgstr ""
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr ""
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr ""
@@ -5862,7 +5866,7 @@ msgstr ""
msgid "Asset Finance Book"
msgstr "كتاب الأصول المالية"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr ""
@@ -5938,7 +5942,7 @@ msgstr "تم إنشاء سجل حركة الأصول {0}\\n
\\nAsset Movement
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr "اسم الأصول"
@@ -6024,9 +6028,9 @@ msgstr "حالة الأصول"
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr "قيمة الأصول"
@@ -6055,7 +6059,7 @@ msgstr ""
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "لا يمكن إلغاء الأصل، لانه بالفعل {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr ""
@@ -6087,7 +6091,7 @@ msgstr ""
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr ""
@@ -6099,11 +6103,11 @@ msgstr ""
msgid "Asset returned"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr "ألغت الأصول عن طريق قيد اليومية {0}\\n
\\n Asset scrapped via Journal Entry {0}"
@@ -6128,7 +6132,7 @@ msgstr ""
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr "لا يمكن إلغاء الأصل {0} ، كما هو بالفعل {1}\\n
\\nAsset {0} cannot be scrapped, as it is already {1}"
@@ -6161,7 +6165,15 @@ msgstr ""
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr ""
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr "الاصل {0} يجب تقديمه"
@@ -6542,7 +6554,7 @@ msgstr ""
msgid "Auto Reconcile Payments"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr ""
@@ -6552,7 +6564,7 @@ msgstr ""
msgid "Auto Reconciliation Job Trigger"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr ""
@@ -6727,7 +6739,7 @@ msgstr "الكمية المتاحة من الباتش فى المخزن"
msgid "Available Batch Report"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr "متاح للاستخدام تاريخ"
@@ -6956,7 +6968,7 @@ msgstr "قائمة مكونات المواد"
msgid "BOM 1"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "يجب ألا يكون BOM 1 {0} و BOM 2 {1} متطابقين"
@@ -7194,23 +7206,23 @@ msgstr "فاتورة الموارد لا تحتوي على أي صنف مخزو
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr "تكرار BOM: {0} لا يمكن أن يكون تابعًا لـ {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr "قائمة المواد {0} لا تنتمي إلى الصنف {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr "قائمة مكونات المواد {0} يجب أن تكون نشطة\\n
\\nBOM {0} must be active"
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr "قائمة مكونات المواد {0} يجب أن تكون مسجلة\\n
\\nBOM {0} must be submitted"
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr ""
@@ -7281,7 +7293,7 @@ msgstr "الموازنة"
msgid "Balance (Dr - Cr)"
msgstr "الرصيد (مدين - دائن)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr "الرصيد ({0})"
@@ -7760,7 +7772,7 @@ msgstr ""
msgid "Base Tax Withholding Net Total"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr ""
@@ -7965,7 +7977,9 @@ msgstr "حالة انتهاء صلاحية الدفعة الصنف"
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -7976,7 +7990,7 @@ msgstr "رقم دفعة"
msgid "Batch No is mandatory"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr ""
@@ -7999,7 +8013,7 @@ msgstr ""
msgid "Batch Nos"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr ""
@@ -8012,7 +8026,7 @@ msgstr ""
msgid "Batch Number Series"
msgstr "سلسلة رقم الدفعة"
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr ""
@@ -8125,7 +8139,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8438,8 +8452,8 @@ msgstr "صنف أمر بطانية"
msgid "Blanket Order Rate"
msgstr "بطالة سعر النظام"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr "حظر الفاتورة"
@@ -8555,7 +8569,7 @@ msgstr "حجز الأصول الثابتة"
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr ""
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr ""
@@ -9329,7 +9343,7 @@ msgstr "لا يمكن التصفية بناءً على طريقة الدفع ،
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr "لا يمكن الفلتره علي اساس (رقم الأيصال)، إذا تم وضعه في مجموعة على اساس (ايصال)"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr "يمكن إجراء دفعة فقط مقابل فاتورة غير مدفوعة {0}"
@@ -9515,7 +9529,7 @@ msgstr "لا يمكن تحسين المسار لأن عنوان برنامج ا
msgid "Cannot Relieve Employee"
msgstr "لا يمكن إعفاء الموظف"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr ""
@@ -9531,6 +9545,10 @@ msgstr ""
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr "لا يمكن أن يكون عنصر الأصول الثابتة كما يتم إنشاء دفتر الأستاذ."
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr ""
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr ""
@@ -9620,7 +9638,7 @@ msgstr ""
msgid "Cannot create root account."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr "لا يمكن تعطيل أو إلغاء قائمة المواد لانها مترابطة مع قوائم مواد اخرى"
@@ -9637,7 +9655,7 @@ msgstr "لا يمكن الخصم عندما تكون الفئة \"التقييم
msgid "Cannot delete Exchange Gain/Loss row"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr "لا يمكن حذف الرقم التسلسلي {0}، لانه يتم استخدامها في قيود المخزون"
@@ -10083,11 +10101,11 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr "تغيير المبلغ"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr "تغيير تاريخ الإصدار"
@@ -10100,7 +10118,7 @@ msgstr "تغيير تاريخ الإصدار"
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr ""
@@ -10908,6 +10926,7 @@ msgstr "شركات"
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11055,6 +11074,7 @@ msgstr "شركات"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11140,8 +11160,8 @@ msgstr "شركات"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11457,7 +11477,7 @@ msgstr ""
msgid "Company and Posting Date is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr "يجب أن تتطابق عملات الشركة لكلتا الشركتين مع معاملات Inter Inter Company."
@@ -12738,7 +12758,7 @@ 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12757,7 +12777,7 @@ msgstr "كلفة"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -12970,7 +12990,7 @@ msgstr ""
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr "تعذر إنشاء العميل تلقائيًا بسبب الحقول الإلزامية التالية المفقودة:"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr "تعذر إنشاء إشعار دائن تلقائيًا ، يُرجى إلغاء تحديد "إشعار ائتمان الإصدار" وإرساله مرة أخرى"
@@ -13093,15 +13113,15 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13343,7 +13363,7 @@ msgstr ""
msgid "Create POS Opening Entry"
msgstr "إنشاء مدخل فتح نقطة البيع"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr "إنشاء إدخال الدفع"
@@ -13499,7 +13519,7 @@ msgstr "إنشاء حسابات ..."
msgid "Creating Delivery Note ..."
msgstr ""
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr "إنشاء الأبعاد ..."
@@ -13519,7 +13539,7 @@ msgstr ""
msgid "Creating Purchase Order ..."
msgstr "إنشاء أمر شراء ..."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13556,11 +13576,6 @@ msgstr "إنشاء {} من {} {}"
msgid "Creation"
msgstr ""
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr "إنشاء وثيقة رقم"
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr ""
@@ -13593,11 +13608,11 @@ msgstr ""
msgid "Credit"
msgstr "دائن"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr "الائتمان ({0})"
@@ -13740,7 +13755,7 @@ 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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr "تم إنشاء ملاحظة الائتمان {0} تلقائيًا"
@@ -13948,7 +13963,7 @@ msgstr ""
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14047,7 +14062,7 @@ msgstr "لا يمكن تغيير العملة بعد إجراء إدخالات
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr "العملة ل {0} يجب أن تكون {1} \\n
\\nCurrency for {0} must be {1}"
@@ -14397,6 +14412,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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14424,6 +14440,10 @@ msgstr ""
msgid "Customer / Lead Address"
msgstr "العميل/ عنوان العميل المحتمل"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr ""
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14825,7 +14845,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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr "العميل {0} لا ينتمي الى المشروع {1}\\n
\\nCustomer {0} does not belong to project {1}"
@@ -15177,7 +15197,7 @@ msgstr "تاريخ الإصدار"
msgid "Date of Joining"
msgstr "تاريخ الالتحاق بالعمل"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr "تاريخ المعاملة"
@@ -15314,11 +15334,11 @@ msgstr "عزيزي مدير النظام،"
msgid "Debit"
msgstr "مدين"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr "مدين ({0})"
@@ -15392,7 +15412,7 @@ msgstr "الخصم ل"
msgid "Debit To is required"
msgstr "مدين الى مطلوب"
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr "المدين و الدائن غير متساوي ل {0} # {1}. الفرق هو {2}."
@@ -16459,7 +16479,7 @@ msgstr ""
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16534,9 +16554,9 @@ msgstr ""
msgid "Depreciate based on shifts"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr "المبلغ المستهلك"
@@ -16592,6 +16612,14 @@ msgstr "حركة الإهلاك"
msgid "Depreciation Entry Posting Status"
msgstr ""
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr ""
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16600,7 +16628,7 @@ msgstr ""
msgid "Depreciation Expense Account"
msgstr "حساب نفقات الاهلاك"
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr ""
@@ -17486,6 +17514,10 @@ msgstr ""
msgid "Discount Percentage"
msgstr "نسبة الخصم"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr ""
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr ""
@@ -17718,7 +17750,7 @@ msgstr "إعدادات الإرسال"
msgid "Disposal Date"
msgstr "تاريخ التخلص"
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr ""
@@ -17998,7 +18030,7 @@ msgstr ""
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr ""
@@ -19037,7 +19069,7 @@ msgstr "فارغة"
msgid "Ems(Pica)"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr ""
@@ -19388,7 +19420,7 @@ msgstr ""
msgid "Enter a name for this Holiday List."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr "أدخل المبلغ المراد استرداده."
@@ -19449,7 +19481,7 @@ msgstr ""
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr "أدخل مبلغ {0}."
@@ -19469,7 +19501,7 @@ msgid "Entity"
msgstr "كيان"
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19564,7 +19596,7 @@ msgstr "حدث خطأ أثناء تقييم صيغة المعايير"
msgid "Error in party matching for Bank Transaction {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr ""
@@ -19614,10 +19646,8 @@ msgstr "الوقت المقدر والتكلفة"
msgid "Evaluation Period"
msgstr "فترة التقييم"
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
msgstr ""
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
@@ -19979,7 +20009,7 @@ msgstr "القيمة المتوقعة بعد حياة مفيدة"
msgid "Expense"
msgstr "نفقة"
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr "حساب نفقات / قروق ({0}) يجب ان يكون حساب ارباح و خسائر"
@@ -20024,7 +20054,7 @@ msgstr "حساب نفقات / قروق ({0}) يجب ان يكون حساب ار
msgid "Expense Account"
msgstr "حساب النفقات"
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr "حساب المصاريف مفقود"
@@ -20331,7 +20361,7 @@ msgstr "تاريخ الفشل"
msgid "Failure Description"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr ""
@@ -21007,6 +21037,10 @@ msgstr "يجب أن يكون بند الأصول الثابتة عنصرا غي
msgid "Fixed Asset Register"
msgstr "سجل الأصول الثابتة"
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21137,7 +21171,7 @@ msgstr "للمورد الافتراضي (اختياري)"
msgid "For Item"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr ""
@@ -22029,7 +22063,7 @@ msgstr "الدفع في المستقبل المرجع"
msgid "Future Payments"
msgstr "المدفوعات المستقبلية"
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr ""
@@ -22045,7 +22079,7 @@ msgstr ""
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr "GL الدخول"
@@ -22311,8 +22345,8 @@ msgid "Get Items"
msgstr "احصل على البنود"
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22671,7 +22705,7 @@ msgstr ""
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22681,7 +22715,7 @@ msgstr ""
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22802,8 +22836,8 @@ msgstr ""
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr "اجمالي مبلغ المشتريات"
@@ -23154,7 +23188,7 @@ msgstr ""
msgid "Height (cm)"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr ""
@@ -23193,7 +23227,7 @@ msgstr "نص المساعدة"
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr ""
@@ -23289,7 +23323,7 @@ msgstr "معلق"
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr "عقد الفاتورة"
@@ -23383,6 +23417,10 @@ msgstr "ساعات"
msgid "Hours Spent"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr ""
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23719,6 +23757,10 @@ msgstr ""
msgid "If more than one package of the same type (for print)"
msgstr "إذا كان أكثر من حزمة واحدة من نفس النوع (للطباعة)"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr ""
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23735,6 +23777,10 @@ msgstr ""
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr ""
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23817,6 +23863,10 @@ msgstr "إذا تم تحديده ، يمكن استخدام مواد متعدد
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr "إذا تم تحديدها ، فسيتم تحديث تكلفة قائمة مكونات الصنف تلقائيًا استنادًا إلى معدل التقييم / سعر قائمة الأسعار / معدل الشراء الأخير للمواد الخام."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr ""
@@ -23911,7 +23961,7 @@ msgstr ""
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -23963,7 +24013,7 @@ msgstr ""
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr ""
@@ -24726,7 +24776,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24799,7 +24849,7 @@ msgstr ""
msgid "Incorrect Stock Value Report"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr ""
@@ -24966,13 +25016,13 @@ msgstr "أدخل سجلات جديدة"
msgid "Inspected By"
msgstr "تفتيش من قبل"
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr ""
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr "التفتيش مطلوب"
@@ -24989,7 +25039,7 @@ msgstr "التفتيش المطلوبة قبل تسليم"
msgid "Inspection Required before Purchase"
msgstr "التفتيش المطلوبة قبل الشراء"
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr ""
@@ -25019,7 +25069,7 @@ msgstr "ملاحظة التثبيت"
msgid "Installation Note Item"
msgstr "ملاحظة تثبيت الإغلاق"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr "مذكرة التسليم {0} ارسلت\\n
\\nInstallation Note {0} has already been submitted"
@@ -25077,7 +25127,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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "المالية غير كافية"
@@ -25268,7 +25318,7 @@ msgstr ""
msgid "Internal Work History"
msgstr "سجل العمل الداخلي"
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr ""
@@ -25304,7 +25354,7 @@ msgid "Invalid Account"
msgstr "حساب غير صالح"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr ""
@@ -25332,7 +25382,7 @@ msgstr "طلب فارغ غير صالح للعميل والعنصر المحدد
msgid "Invalid Child Procedure"
msgstr "إجراء الطفل غير صالح"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr "شركة غير صالحة للمعاملات بين الشركات."
@@ -25390,7 +25440,7 @@ msgid "Invalid Ledger Entries"
msgstr ""
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr "إدخال فتح غير صالح"
@@ -25418,7 +25468,7 @@ msgstr ""
msgid "Invalid Priority"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr ""
@@ -25502,8 +25552,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr ""
@@ -25511,7 +25561,7 @@ msgstr ""
msgid "Invalid {0}"
msgstr "غير صالح {0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr "غير صالح {0} للمعاملات بين الشركات."
@@ -25721,7 +25771,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26773,6 +26823,8 @@ msgstr ""
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26791,7 +26843,11 @@ msgstr "رمز السلعة"
msgid "Item Code (Final Product)"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr ""
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr "لا يمكن تغيير رمز السلعة للرقم التسلسلي"
@@ -27195,6 +27251,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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28115,7 +28172,7 @@ msgstr "قيد دفتر يومية للتخريد"
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr "قيد دفتر اليومية {0} ليس لديه حساب {1} أو قد تم مطابقته مسبقا مع إيصال أخرى"
@@ -28321,7 +28378,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29037,7 +29094,7 @@ msgstr "محلي"
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29708,7 +29765,7 @@ msgstr ""
msgid "Mandatory Depends On"
msgstr "إلزامي يعتمد على"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr ""
@@ -29798,6 +29855,7 @@ msgstr "لا يمكن إنشاء الإدخال اليدوي! قم بتعطيل
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30356,6 +30414,7 @@ msgid "Material Requested"
msgstr "المواد المطلوبة"
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr "طلبات المواد"
@@ -30711,7 +30770,7 @@ msgstr "رسالة"
msgid "Message Examples"
msgstr "أمثلة رسالة"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr "تم ارسال الرسالة"
@@ -31025,8 +31084,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr "حساب مفقود"
@@ -31044,6 +31103,10 @@ msgstr ""
msgid "Missing Default in Company"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr ""
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr ""
@@ -31076,7 +31139,7 @@ msgstr "قيم مفقودة مطلوبة"
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr "قالب بريد إلكتروني مفقود للإرسال. يرجى ضبط واحد في إعدادات التسليم."
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr ""
@@ -31742,7 +31805,7 @@ msgstr "غاز طبيعي"
msgid "Needs Analysis"
msgstr "تحليل الاحتياجات"
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr ""
@@ -32174,7 +32237,7 @@ msgstr "طلب مبيعات جديد"
msgid "New Sales Person Name"
msgstr "اسم شخص المبيعات الجديد"
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr "المسلسل الجديد غير ممكن للمستودع . يجب ان يكون المستودع مجهز من حركة المخزون او المشتريات المستلمة"
@@ -32210,7 +32273,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:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr "يجب أن يكون تاريخ الإصدار الجديد في المستقبل"
@@ -32319,7 +32382,7 @@ msgstr "لا رد فعل"
msgid "No Answer"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr "لم يتم العثور على زبون للمعاملات بين الشركات التي تمثل الشركة {0}"
@@ -32376,9 +32439,9 @@ msgstr ""
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr "لا يوجد تصريح"
@@ -32413,7 +32476,7 @@ msgstr ""
msgid "No Summary"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr "لم يتم العثور على مورد للمعاملات بين الشركات التي تمثل الشركة {0}"
@@ -32511,7 +32574,7 @@ msgstr ""
msgid "No items to be received are overdue"
msgstr "لا توجد عناصر يتم استلامها متأخرة"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr ""
@@ -32645,11 +32708,11 @@ msgstr ""
msgid "No values"
msgstr "لا توجد قيم"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr "لم يتم العثور على {0} معاملات Inter Company."
@@ -32684,7 +32747,7 @@ msgstr ""
msgid "Non Profit"
msgstr "غير ربحية"
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr "البنود غير الأسهم"
@@ -32863,7 +32926,7 @@ msgstr ""
msgid "Note: Email will not be sent to disabled users"
msgstr "ملاحظة: لن يتم إرسال الايميل إلى المستخدم الغير نشط"
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr ""
@@ -32883,7 +32946,7 @@ msgstr "ملاحظة: مركز التكلفة هذا هو مجموعة. لا ي
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr "ملاحظة : {0}"
@@ -32899,6 +32962,7 @@ msgstr "ملاحظة : {0}"
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33334,6 +33398,12 @@ msgstr "المصنف ليس مجموعة فقط مسموح به في المعا
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr ""
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr ""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33535,8 +33605,8 @@ msgstr "افتتاحي (Dr)"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr "الاهلاك التراكمي الافتتاحي"
@@ -33578,7 +33648,7 @@ msgstr "تاريخ الفتح"
msgid "Opening Entry"
msgstr "فتح مدخل"
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr ""
@@ -33606,7 +33676,7 @@ msgid "Opening Invoice Item"
msgstr "فتح الفاتورة البند"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 ""
@@ -33680,7 +33750,7 @@ msgstr "تكاليف التشغيل (عملة الشركة)"
msgid "Operating Cost Per BOM Quantity"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr "تكلفة التشغيل حسب أمر العمل / BOM"
@@ -33836,7 +33906,7 @@ msgstr "العمليات"
msgid "Operations Routing"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr "لا يمكن ترك (العمليات) فارغة"
@@ -34428,7 +34498,7 @@ msgstr ""
msgid "Over Picking Allowance"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr ""
@@ -34880,7 +34950,7 @@ msgstr "عنصر معبأ"
msgid "Packed Items"
msgstr "عناصر معبأة"
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr ""
@@ -34915,7 +34985,7 @@ msgstr "قائمة بمحتويات الشحنة"
msgid "Packing Slip Item"
msgstr "مادة كشف التعبئة"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr "تم إلغاء قائمة الشحنة"
@@ -35001,7 +35071,7 @@ msgstr "مدفوع"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35276,7 +35346,7 @@ msgstr ""
msgid "Partial Payment in POS Transactions are not allowed."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr ""
@@ -35470,9 +35540,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35633,9 +35703,9 @@ 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35800,7 +35870,7 @@ msgstr "إعدادات الدافع"
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -35936,7 +36006,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr "تم تعديل تدوين مدفوعات بعد سحبه. يرجى سحبه مرة أخرى."
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr "تدوين المدفوعات تم انشاؤه بالفعل"
@@ -36145,7 +36215,7 @@ msgstr "المراجع الدفع"
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36171,11 +36241,11 @@ msgstr "نوع طلب الدفع"
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr "طلب الدفع ل {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr ""
@@ -36333,7 +36403,7 @@ msgstr ""
msgid "Payment Unlink Error"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr "الدفعة مقابل {0} {1} لا يمكن أن تكون أكبر من المبلغ القائم {2}"
@@ -36654,7 +36724,7 @@ msgstr "فترة"
msgid "Period Based On"
msgstr "الفترة على أساس"
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr ""
@@ -37257,7 +37327,7 @@ msgstr "الرجاء إضافة الحساب إلى شركة على مستوى
msgid "Please add {1} role to user {0}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr ""
@@ -37265,7 +37335,7 @@ msgstr ""
msgid "Please attach CSV file"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr ""
@@ -37278,7 +37348,7 @@ msgstr ""
msgid "Please cancel related transaction."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr "يرجى اختيار الخيار عملات متعددة للسماح بحسابات مع عملة أخرى"
@@ -37355,7 +37425,7 @@ msgstr "الرجاء إنشاء إيصال شراء أو فاتورة شراء
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr ""
@@ -37479,7 +37549,7 @@ msgstr "الرجاء إدخال إيصال الشراء أولا\\n
\\nPlease
msgid "Please enter Receipt Document"
msgstr "الرجاء إدخال مستند الاستلام\\n
\\nPlease enter Receipt Document"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr "الرجاء إدخال تاريخ المرجع\\n
\\nPlease enter Reference date"
@@ -37604,8 +37674,8 @@ msgstr "يرجى التأكد من أنك تريد حقا حذف جميع الم
msgid "Please mention 'Weight UOM' along with Weight."
msgstr ""
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr ""
@@ -37733,7 +37803,7 @@ msgstr "الرجاء تجديد تاريخ النشر قبل تحديد المس
msgid "Please select Posting Date first"
msgstr "الرجاء تحديد تاريخ النشر أولا\\n
\\nPlease select Posting Date first"
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr "الرجاء اختيار قائمة الأسعار\\n
\\nPlease select Price List"
@@ -37765,7 +37835,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr "يرجى تحديد بوم"
@@ -37855,6 +37925,10 @@ msgstr "يرجى اختيار قيمة ل {0} عرض مسعر إلى {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
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr ""
@@ -37863,7 +37937,7 @@ msgstr ""
msgid "Please select atleast one operation to create Job Card"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr "يرجى اختيارالحساب الصحيح"
@@ -37944,15 +38018,15 @@ msgstr "الرجاء تحديد {0} أولا\\n
\\nPlease select {0} first"
msgid "Please set 'Apply Additional Discount On'"
msgstr "يرجى تحديد 'تطبيق خصم إضافي على'"
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr "يرجى تحديد \"مركز تكلفة اهلاك الأصول\" للشركة {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr "يرجى تحديد \"احساب لربح / الخسارة عند التخلص من الأصول\" للشركة {0}"
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr ""
@@ -37960,7 +38034,7 @@ msgstr ""
msgid "Please set Account"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr ""
@@ -37986,7 +38060,7 @@ msgstr ""
msgid "Please set Company"
msgstr "يرجى تعيين الشركة"
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr "يرجى تحديد الحسابات المتعلقة بالاهلاك في فئة الأصول {0} أو الشركة {1}"
@@ -38004,7 +38078,7 @@ msgstr ""
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr ""
@@ -38067,7 +38141,7 @@ msgstr "يرجى تعيين الحساب في مستودع {0}"
msgid "Please set an Address on the Company '%s'"
msgstr ""
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr ""
@@ -38083,23 +38157,23 @@ msgstr "يرجى ضبط صف واحد على الأقل في جدول الضرا
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr "الرجاء تحديد الحساب البنكي أو النقدي الافتراضي في نوع الدفع\\n
\\nPlease set default Cash or Bank account in Mode of Payment {0}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr "الرجاء تعيين حساب نقدي أو مصرفي افتراضي في طريقة الدفع {}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "الرجاء تعيين حساب نقدي أو مصرفي افتراضي في طريقة الدفع {}"
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr ""
@@ -38203,7 +38277,7 @@ msgstr ""
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr ""
@@ -38216,7 +38290,7 @@ msgid "Please specify Company"
msgstr "يرجى تحديد شركة"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr "الرجاء تحديد الشركة للمضى قدما\\n
\\nPlease specify Company to proceed"
@@ -38389,6 +38463,7 @@ msgstr "نفقات بريدية"
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38423,11 +38498,11 @@ 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38446,6 +38521,7 @@ msgstr "نفقات بريدية"
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38455,6 +38531,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_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
@@ -39020,6 +39097,14 @@ msgstr "قاعدة بند التسعير"
msgid "Pricing Rule Item Group"
msgstr "مجموعة قاعدة التسعير"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr ""
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr ""
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr "يتم تحديث قاعدة التسعير {0}"
@@ -39078,6 +39163,10 @@ msgstr "يتم تحديث قاعدة التسعير {0}"
msgid "Pricing Rules"
msgstr "قواعد التسعير"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr ""
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39465,7 +39554,7 @@ msgstr "وصف العملية"
msgid "Process Loss"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr ""
@@ -39955,7 +40044,7 @@ msgstr ""
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40430,7 +40519,7 @@ msgstr "تحليلات المشتريات"
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr "تاريخ الشراء"
@@ -40586,7 +40675,7 @@ msgstr "المدير الرئيسي للمشتريات"
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40762,9 +40851,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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41645,6 +41734,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/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
@@ -41761,7 +41851,7 @@ msgstr "الكمية يجب ألا تكون أكثر من {0}"
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr "الكمية من البنود التي تم الحصول عليها بعد التصنيع / إعادة التعبئة من الكميات المعطاء من المواد الخام"
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr "الكمية مطلوبة للبند {0} في الصف {1}\\n
\\nQuantity required for Item {0} in row {1}"
@@ -42610,7 +42700,7 @@ msgid "Reason"
msgstr "سبب"
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "سبب لوضع في الانتظار"
@@ -43046,7 +43136,7 @@ msgstr "استبدال مقابل"
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr "استبدل نقاط الولاء"
@@ -43178,7 +43268,7 @@ msgstr "تاريخ المرجع"
msgid "Reference"
msgstr "مرجع"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr "المرجع # {0} بتاريخ {1}"
@@ -43316,7 +43406,7 @@ msgstr "اسم الإشارة"
msgid "Reference No"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr "رقم المرجع وتاريخه مطلوبان ل {0}\\n
\\nReference No & Reference Date is required for {0}"
@@ -43324,11 +43414,11 @@ msgstr "رقم المرجع وتاريخه مطلوبان ل {0}\\n
\\nRefere
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr "رقم المرجع و تاريخ المرجع إلزامي للمعاملة المصرفية"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr "رقم المرجع إلزامي اذا أدخلت تاريخ المرجع\\n
\\nReference No is mandatory if you entered Reference Date"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr "رقم المرجع."
@@ -43442,11 +43532,11 @@ msgstr "المرجع: {0}، رمز العنصر: {1} والعميل: {2}"
msgid "References"
msgstr "المراجع"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr ""
@@ -43591,8 +43681,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43611,7 +43701,7 @@ msgstr "تاريخ المغادرة"
msgid "Remaining"
msgstr "المتبقية"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr ""
@@ -43624,7 +43714,7 @@ msgstr "الرصيد المتبقي"
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr "كلام"
@@ -43673,7 +43763,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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -43984,7 +44074,7 @@ msgstr ""
msgid "Repost Status"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr ""
@@ -44308,7 +44398,7 @@ msgstr "إعادة تحديد، إذا تم تحرير جهة الاتصال ا
msgid "Reseller"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr "إعادة إرسال الدفعة عبر البريد الإلكتروني"
@@ -44777,7 +44867,7 @@ msgstr "عودة"
msgid "Return / Credit Note"
msgstr "ارجاع / اشعار دائن"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr "ارجاع / اشعار مدين"
@@ -45301,12 +45391,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: 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/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "الصف رقم {0} (جدول الدفع): يجب أن يكون المبلغ موجبا"
@@ -45452,7 +45542,7 @@ msgstr "الصف # {0}: إدخال مكرر في المراجع {1} {2}"
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr "الصف # {0}: تاريخ التسليم المتوقع لا يمكن أن يكون قبل تاريخ أمر الشراء"
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr ""
@@ -45476,11 +45566,11 @@ msgstr ""
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr ""
@@ -45500,7 +45590,7 @@ msgstr "الصف # {0}: تمت إضافة العنصر"
msgid "Row #{0}: Item {1} does not exist"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr ""
@@ -45536,7 +45626,7 @@ msgstr ""
msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
msgstr "الصف رقم {0}: غير مسموح تغيير المورد لأن أمر الشراء موجود مسبقاً\\n
\\nRow #{0}: Not allowed to change Supplier as Purchase Order already exists"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr ""
@@ -45581,15 +45671,15 @@ msgstr ""
msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr ""
@@ -45598,7 +45688,7 @@ msgstr ""
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "الصف # {0}: كمية البند {1} لا يمكن أن يكون صفرا"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr ""
@@ -45692,19 +45782,19 @@ msgstr "الصف # {0}: يجب أن تكون الحالة {1} بالنسبة ل
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr ""
@@ -45712,8 +45802,8 @@ msgstr ""
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr ""
@@ -45894,7 +45984,7 @@ msgstr ""
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr ""
@@ -45902,11 +45992,11 @@ msgstr ""
msgid "Row {0}: Activity Type is mandatory."
msgstr "الصف {0}: نوع النشاط إلزامي."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr "الصف {0}: الدفعة المقدمة مقابل الزبائن يجب أن تكون دائن"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr "الصف {0}:المورد المقابل المتقدم يجب أن يكون مدين\\n
\\nRow {0}: Advance against Supplier must be debit"
@@ -45926,7 +46016,7 @@ msgstr ""
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr "صف {0}: من مواد مشروع القانون لم يتم العثور على هذا البند {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr ""
@@ -45942,7 +46032,7 @@ msgstr ""
msgid "Row {0}: Cost center is required for an item {1}"
msgstr "الصف {0}: مركز التكلفة مطلوب لعنصر {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr "صف {0}: لا يمكن ربط قيد دائن مع {1}"
@@ -45950,7 +46040,7 @@ msgstr "صف {0}: لا يمكن ربط قيد دائن مع {1}"
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr "الصف {0}: العملة للـ BOM #{1} يجب أن يساوي العملة المختارة {2}
Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr "الصف {0}: لا يمكن ربط قيد مدين مع {1}"
@@ -45966,7 +46056,7 @@ msgstr "الصف {0}: لا يمكن أن يكون تاريخ الاستحقاق
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "الصف {0}: سعر صرف إلزامي"
@@ -46000,7 +46090,7 @@ msgstr "صف {0}: (من الوقت) و (إلى وقت) تكون إلزامية."
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr "الصف {0}: من وقت إلى وقت {1} يتداخل مع {2}"
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46012,7 +46102,7 @@ msgstr "الصف {0}: من وقت يجب أن يكون أقل من الوقت"
msgid "Row {0}: Hours value must be greater than zero."
msgstr "صف {0}: يجب أن تكون قيمة الساعات أكبر من الصفر."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr "الصف {0}: مرجع غير صالحة {1}"
@@ -46036,7 +46126,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr ""
@@ -46044,7 +46134,7 @@ msgstr ""
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr "الصف {0}: حزب / حساب لا يتطابق مع {1} / {2} في {3} {4}"
@@ -46056,11 +46146,11 @@ msgstr "الصف {0}: نوع الطرف المعني والطرف المعني
msgid "Row {0}: Payment Term is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr "الصف {0}: الدفع لطلب الشراء/البيع يجب أن يكون دائما معلم كمتقدم\\n
\\nRow {0}: Payment against Sales/Purchase Order should always be marked as advance"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr "الصف {0}: يرجى اختيار \"دفعة مقدمة\" مقابل الحساب {1} إذا كان هذا الادخال دفعة مقدمة."
@@ -46128,7 +46218,7 @@ msgstr ""
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr "الصف {0}: العنصر المتعاقد عليه من الباطن إلزامي للمادة الخام {1}"
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46152,7 +46242,7 @@ msgstr ""
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "الصف {0}: عامل تحويل UOM إلزامي\\n
\\nRow {0}: UOM Conversion Factor is mandatory"
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr ""
@@ -46173,7 +46263,7 @@ msgstr "الصف {0}: يجب أن يكون {1} أكبر من 0"
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr "الصف {0}: {1} {2} لا يتطابق مع {3}"
@@ -46566,7 +46656,7 @@ msgstr ""
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr "سبق أن تم ترحيل فاتورة المبيعات {0}"
@@ -46795,7 +46885,7 @@ msgstr ""
msgid "Sales Order Trends"
msgstr "مجرى طلبات البيع"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr "طلب البيع مطلوب للبند {0}\\n
\\nSales Order required for Item {0}"
@@ -47305,8 +47395,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47577,7 +47667,7 @@ msgstr "الخردة المواد التكلفة (شركة العملات)"
msgid "Scrap Warehouse"
msgstr "الخردة مستودع"
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr ""
@@ -47650,7 +47740,7 @@ msgstr ""
msgid "Section"
msgstr "الجزء"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr "كود القسم"
@@ -48020,7 +48110,7 @@ msgstr "حدد، لجعل العميل قابلا للبحث باستخدام ه
msgid "Selected POS Opening Entry should be open."
msgstr "يجب أن يكون الإدخال الافتتاحي المحدد لنقاط البيع مفتوحًا."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr "قائمة الأسعار المختارة يجب أن يكون لديها حقول بيع وشراء محددة."
@@ -48204,7 +48294,7 @@ msgstr "إرسال مع المرفقات"
msgid "Sender"
msgstr "مرسل"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr "إرسال"
@@ -48328,7 +48418,9 @@ msgstr ""
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48359,7 +48451,9 @@ msgid "Serial No Count"
msgstr "المسلسل لا عد"
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr ""
@@ -48367,7 +48461,7 @@ msgstr ""
msgid "Serial No Range"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr ""
@@ -48407,6 +48501,13 @@ msgstr "الرقم التسلسلي والدفعة"
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr ""
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr ""
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr ""
@@ -48436,7 +48537,7 @@ msgstr "الرقم المتسلسل {0} لا ينتمي إلى البند {1}\\n
msgid "Serial No {0} does not exist"
msgstr "الرقم المتسلسل {0} غير موجود\\n
\\nSerial No {0} does not exist"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr ""
@@ -48485,7 +48586,7 @@ msgstr ""
msgid "Serial Nos and Batches"
msgstr "الرقم التسلسلي ودفعات"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr ""
@@ -48563,11 +48664,11 @@ msgstr ""
msgid "Serial and Batch Bundle"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr ""
@@ -49001,7 +49102,7 @@ msgstr ""
msgid "Set Loyalty Program"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr "تعيين تاريخ الإصدار الجديد"
@@ -49256,7 +49357,7 @@ msgstr ""
msgid "Setting up company"
msgstr "تأسيس شركة"
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49440,7 +49541,7 @@ msgstr ""
msgid "Shipment details"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr "شحنات"
@@ -49687,6 +49788,10 @@ msgstr "إظهار الإدخالات الملغاة"
msgid "Show Completed"
msgstr "عرض مكتمل"
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr ""
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr "إظهار المبلغ التراكمي"
@@ -49802,7 +49907,7 @@ msgstr ""
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr ""
@@ -50107,13 +50212,27 @@ msgstr "المصدر"
msgid "Source DocType"
msgstr "المصدر DocType"
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr ""
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr "اسم المستند المصدر"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr ""
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr "نوع المستند المصدر"
@@ -50184,7 +50303,7 @@ msgstr "عنوان مستودع المصدر"
msgid "Source Warehouse Address Link"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr ""
@@ -50695,7 +50814,7 @@ msgstr "الولاية / المقاطعة"
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51038,7 +51157,7 @@ msgstr "الأسهم الدخول {0} خلق"
msgid "Stock Entry {0} has created"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr "الحركة المخزنية {0} غير مسجلة"
@@ -51261,13 +51380,13 @@ msgstr ""
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51276,13 +51395,13 @@ msgstr ""
msgid "Stock Reservation"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr ""
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr ""
@@ -51304,7 +51423,7 @@ msgstr ""
msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr ""
@@ -51549,7 +51668,7 @@ msgstr ""
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr ""
@@ -51565,7 +51684,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr ""
@@ -52433,10 +52552,15 @@ 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "المورد"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr ""
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52549,7 +52673,7 @@ msgstr ""
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr "المورد فاتورة التسجيل"
@@ -52563,8 +52687,8 @@ 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "رقم فاتورة المورد"
@@ -53111,16 +53235,16 @@ msgstr ""
msgid "System will notify to increase or decrease quantity or amount "
msgstr "سيُعلم النظام بزيادة أو تقليل الكمية أو الكمية"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr ""
@@ -53137,7 +53261,7 @@ msgstr ""
msgid "TDS Payable"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr ""
@@ -53693,7 +53817,7 @@ msgstr "نوع الضريبة"
msgid "Tax Withheld Vouchers"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr ""
@@ -54318,7 +54442,7 @@ msgstr "تم تعطيل الوصول إلى طلب عرض الأسعار من ا
msgid "The BOM which will be replaced"
msgstr "وBOM التي سيتم استبدالها"
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr ""
@@ -54346,7 +54470,7 @@ msgstr ""
msgid "The Loyalty Program isn't valid for the selected company"
msgstr "برنامج الولاء غير صالح للشركة المختارة"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr ""
@@ -54370,7 +54494,7 @@ msgstr ""
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr ""
@@ -54392,7 +54516,7 @@ msgstr ""
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr "رئيس الحساب تحت المسؤولية أو الأسهم، والتي سيتم حجز الربح / الخسارة"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr ""
@@ -54433,7 +54557,7 @@ msgstr "لا يمكن ترك الحقل من المساهمين فارغا"
msgid "The field To Shareholder cannot be blank"
msgstr "لا يمكن ترك الحقل للمساهم فارغا"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr ""
@@ -54449,7 +54573,7 @@ msgstr "أرقام الورقة غير متطابقة"
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr ""
@@ -54710,6 +54834,10 @@ msgstr ""
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr "هناك صيانة نشطة أو إصلاحات ضد الأصل. يجب عليك إكمالها جميعًا قبل إلغاء الأصل."
@@ -54976,7 +55104,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr ""
@@ -54984,7 +55112,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr ""
@@ -55759,6 +55887,10 @@ msgstr "ل تشمل الضريبة في الصف {0} في معدل الإغلا
msgid "To merge, following properties must be same for both items"
msgstr "لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr "لإلغاء هذا ، قم بتمكين "{0}" في الشركة {1}"
@@ -55776,7 +55908,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr ""
@@ -55998,7 +56130,7 @@ msgstr ""
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56160,7 +56292,7 @@ msgstr "يجب أن يكون إجمالي مبلغ الائتمان / المدي
msgid "Total Debit"
msgstr "مجموع الخصم"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr "يجب أن يكون إجمالي الخصم يساوي إجمالي الائتمان ."
@@ -56753,6 +56885,10 @@ msgstr "المجاميع"
msgid "Traceability"
msgstr "التتبع"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr ""
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56793,7 +56929,7 @@ msgstr ""
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -56891,7 +57027,7 @@ msgstr ""
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr "نوع المعاملة"
@@ -56913,7 +57049,7 @@ msgstr "إشارة عملية لا {0} بتاريخ {1}"
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57510,7 +57646,11 @@ msgstr "المبلغ غير المخصصة"
msgid "Unassigned Qty"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr "الافراج عن الفاتورة"
@@ -58877,7 +59017,7 @@ msgstr ""
msgid "Vendor Invoices"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr "اسم البائع"
@@ -58944,7 +59084,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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59135,11 +59275,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59174,7 +59314,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr ""
@@ -59206,9 +59346,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59227,6 +59367,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_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
@@ -59436,6 +59577,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_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
@@ -59544,7 +59686,7 @@ msgstr "مستودع والمراجع"
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr "لا يمكن حذف مستودع كما دخول دفتر الأستاذ موجود لهذا المستودع.\\n
\\nWarehouse can not be deleted as stock ledger entry exists for this warehouse."
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr "المستودع لا يمكن ان يكون متغير لرقم تسلسلى.\\n
\\nWarehouse cannot be changed for Serial No."
@@ -59557,7 +59699,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:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr "مستودع الأسهم المطلوبة لل تفاصيل {0}"
@@ -59708,7 +59850,7 @@ msgstr ""
msgid "Warning!"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr "تحذير: {0} أخر # {1} موجود في مدخل المخزن {2}\\n
\\nWarning: Another {0} # {1} exists against stock entry {2}"
@@ -60191,6 +60333,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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "أمر العمل"
@@ -60666,7 +60809,7 @@ msgstr ""
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr "غير مسموح لك بالتحديث وفقًا للشروط المحددة في {} سير العمل."
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr "غير مصرح لك باضافه إدخالات أو تحديثها قبل {0}\\n
\\nYou are not authorized to add or update entries before {0}"
@@ -60698,7 +60841,7 @@ msgstr "يمكنك أيضًا تعيين حساب CWIP الافتراضي في
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr "يمكنك تغيير الحساب الرئيسي إلى حساب الميزانية العمومية أو تحديد حساب مختلف."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr "لا يمكنك إدخال القسيمة الحالية في عمود 'قيد اليومية المقابل'.\\n
\\nYou can not enter current voucher in 'Against Journal Entry' column"
@@ -60715,7 +60858,7 @@ msgstr "لا يمكنك استرداد سوى {0} نقاط كحد أقصى به
msgid "You can only select one mode of payment as default"
msgstr "يمكنك تحديد طريقة دفع واحدة فقط كطريقة افتراضية"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr "يمكنك استرداد ما يصل إلى {0}."
@@ -60747,11 +60890,11 @@ msgstr ""
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr "لا يمكنك إنشاء أو إلغاء أي قيود محاسبية في فترة المحاسبة المغلقة {0}"
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr "لا يمكن إعطاء الحساب قيمة مدين وقيمة دائن في نفس الوقت"
@@ -60767,7 +60910,7 @@ msgstr "لا يمكنك تحرير عقدة الجذر."
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr "لا يمكنك استرداد أكثر من {0}."
@@ -60799,7 +60942,7 @@ msgstr "ليس لديك أذونات لـ {} من العناصر في {}."
msgid "You don't have enough Loyalty Points to redeem"
msgstr "ليس لديك ما يكفي من نقاط الولاء لاستردادها"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr "ليس لديك ما يكفي من النقاط لاستردادها."
@@ -61225,7 +61368,7 @@ msgstr "عنوان"
msgid "to"
msgstr "إلى"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr ""
@@ -61265,7 +61408,7 @@ msgstr ""
msgid "{0} '{1}' is disabled"
msgstr "{0} '{1}' معطل"
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr "{0} '{1}' ليس في السنة المالية {2}"
@@ -61297,7 +61440,7 @@ msgstr "{0} القسيمة المستخدمة هي {1}. الكمية المسم
msgid "{0} Digest"
msgstr "{0} الملخص"
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr "{0} الرقم {1} مستخدم بالفعل في {2} {3}"
@@ -61313,7 +61456,7 @@ msgstr "{0} طلب {1}"
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr "{0} يعتمد الاحتفاظ بالعينة على الدُفعة ، يُرجى تحديد "رقم الدُفعة" للاحتفاظ بعينة من العنصر"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr ""
@@ -61329,19 +61472,19 @@ msgstr ""
msgid "{0} account not found while submitting purchase receipt"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr "{0} مقابل الفاتورة {1} بتاريخ {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr "{0} مقابل أمر الشراء {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr "{0} مقابل فاتورة المبيعات {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr "{0} مقابل طلب مبيعات {1}"
@@ -61349,7 +61492,7 @@ msgstr "{0} مقابل طلب مبيعات {1}"
msgid "{0} already has a Parent Procedure {1}."
msgstr "{0} يحتوي بالفعل على إجراء الأصل {1}."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr "{0} و {1}"
@@ -61408,7 +61551,7 @@ msgstr "{0} ادخل مرتين في ضريبة البند"
msgid "{0} entered twice {1} in Item Taxes"
msgstr ""
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr "{0} ل {1}"
@@ -61461,7 +61604,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr "{0} إلزامي للصنف {1}\\n
\\n{0} is mandatory for Item {1}"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr ""
@@ -61536,7 +61679,7 @@ msgstr "{0} عناصر منتجة"
msgid "{0} must be negative in return document"
msgstr "{0} يجب أن يكون سالبة في وثيقة الارجاع"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr ""
@@ -61552,7 +61695,7 @@ msgstr "{0} المعلمة غير صالحة"
msgid "{0} payment entries can not be filtered by {1}"
msgstr "{0} لا يمكن فلترة المدفوعات المدخلة {1}"
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr ""
@@ -61613,7 +61756,7 @@ msgstr ""
msgid "{0} {1} Manually"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr ""
@@ -61678,7 +61821,7 @@ msgstr "{0} {1} يتم إلغاؤه أو إيقافه\\n
\\n{0} {1} is cancel
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr "{0} {1} تم إلغاؤه لذلك لا يمكن إكمال الإجراء"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr "{0} {1} مغلقة"
@@ -61690,7 +61833,7 @@ msgstr "{0} {1} معطل"
msgid "{0} {1} is frozen"
msgstr "{0} {1} مجمد"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr "{0} {1} قدمت الفواتير بشكل كامل"
@@ -61702,12 +61845,12 @@ msgstr "{0} {1} غير نشطة"
msgid "{0} {1} is not associated with {2} {3}"
msgstr "{0} {1} غير مرتبط {2} {3}"
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr "{0} {1} لم يتم تقديمه"
@@ -61719,7 +61862,7 @@ msgstr ""
msgid "{0} {1} must be submitted"
msgstr "{0} {1} يجب أن يتم اعتماده\\n
\\n{0} {1} must be submitted"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr ""
@@ -61754,7 +61897,7 @@ msgstr "{0} {1}: الحساب {2} غير فعال \\n
\\n{0} {1}: Account {2}
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr "{0} {1}: قيد محاسبي ل {2} يمكن ان يتم فقط بالعملة : {3}"
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr "{0} {1}: مركز التكلفة إلزامي للبند {2}"
@@ -61832,7 +61975,7 @@ msgstr "{doctype} {name} تم إلغائه أو مغلق."
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr ""
@@ -61840,7 +61983,7 @@ msgstr ""
msgid "{ref_doctype} {ref_name} is {status}."
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr ""
@@ -61898,7 +62041,7 @@ msgstr ""
msgid "{} To Bill"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr "لا يمكن إلغاء {} نظرًا لاسترداد نقاط الولاء المكتسبة. قم أولاً بإلغاء {} لا {}"
diff --git a/erpnext/locale/bs.po b/erpnext/locale/bs.po
index 4a959e192d1..6046a5339f9 100644
--- a/erpnext/locale/bs.po
+++ b/erpnext/locale/bs.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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:10\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:06\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Bosnian\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr " Artikal"
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr "'Dana od posljednje narudžbe' mora biti veći ili jednako nuli"
msgid "'Default {0} Account' in Company {1}"
msgstr "'Standard {0} račun' u Kompaniji {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr "Polje 'Unosi' ne može biti prazno"
@@ -913,11 +913,11 @@ msgstr "Prečice"
msgid "Your Shortcuts"
msgstr "Prečice"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr "Ukupno: {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr "Nepodmireni iznos: {0}"
@@ -1313,10 +1313,10 @@ msgstr "Prema Sastavnici {0}, artikal '{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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1621,7 +1621,7 @@ msgstr "Račun {0}: Nadređeni račun {1} ne postoji"
msgid "Account {0}: You can not assign itself as parent account"
msgstr "Račun {0}: Ne možete se dodijeliti kao nadređeni račun"
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr "Račun: {0} je Kapitalni Rad u toku i ne može se ažurirati Nalogom Knjiženja"
@@ -2110,7 +2110,7 @@ msgstr "Računi Zamrznuti Do"
msgid "Accounts Manager"
msgstr "Upravitelj Knjigovodstva"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr "Greška Nepostojanja Računa"
@@ -2297,7 +2297,7 @@ msgstr "Postavke Kjnigovodstva"
msgid "Accounts User"
msgstr "Korisnik Računa"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr "Tabela računa ne može biti prazna."
@@ -2657,6 +2657,10 @@ msgstr "Stvarno Vrijeme Završetka"
msgid "Actual Expense"
msgstr "Stvarni Trošak"
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr "Stvarni Troškovi"
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2794,7 +2798,7 @@ msgstr "Dodaj / Uredi cijene"
msgid "Add Child"
msgstr "Dodaj Podređeni"
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr "Dodaj Kolone u Valuti Transakcije"
@@ -3600,7 +3604,7 @@ msgstr "Iznos Predujma"
msgid "Advance amount cannot be greater than {0} {1}"
msgstr "Iznos Predujma ne može biti veći od {0} {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr "Predujam plaćen naspram {0} {1} ne može biti veći od ukupnog iznosa {2}"
@@ -3657,7 +3661,7 @@ msgstr "Naspram"
#: 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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr "Naspram Računa"
@@ -3726,7 +3730,7 @@ msgstr "Naspram Računa Troškova"
msgid "Against Income Account"
msgstr "Naspram Računa Prihoda"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr "Naspram Naloga Knjiženja {0} nema neusaglašen unos {1}"
@@ -3774,7 +3778,7 @@ msgstr "Naspram 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr "Naspram Verifikata"
@@ -3786,7 +3790,7 @@ msgstr "Naspram Verifikata"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr "Naspram Verifikata Broj"
@@ -3798,8 +3802,8 @@ msgstr "Naspram Verifikata Broj"
#: 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr "Naspram Verifikata Tipa"
@@ -3925,7 +3929,7 @@ msgstr "Sve"
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr "Kontni Plan"
@@ -4093,7 +4097,7 @@ msgstr "Svi artikli su već traženi"
msgid "All items have already been Invoiced/Returned"
msgstr "Svi Artikli su već Fakturisani/Vraćeni"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr "Svi Artikli su već primljeni"
@@ -4119,7 +4123,7 @@ msgstr "Svi artikli su već vraćeni."
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 "Svi obavezni Artikli (sirovine) bit će preuzeti iz Sastavnice i popunjene u ovoj tabeli. Ovdje također možete promijeniti izvorno skladište za bilo koji artikal. A tokom proizvodnje možete pratiti prenesene sirovine iz ove tabele."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr "Svi ovi Artikli su već Fakturisani/Vraćeni"
@@ -5005,7 +5009,7 @@ msgstr "Izmijenjeno od"
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5145,7 +5149,7 @@ msgstr "Iznos na Slici"
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr "Iznos u Valuti Računa"
@@ -5296,7 +5300,7 @@ msgstr "Još jedan Proračunski zapis '{0}' već postoji naspram {1} '{2}' i ra
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr "Drugi zapis dodjele Centra Troškova {0} primjenjiv od {1}, stoga će ova dodjela biti primjenjiva do {2}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr "Drugi Zahtjev za Plaćanje je već obrađen"
@@ -5879,7 +5883,7 @@ msgstr "Kapitalizacija Imovine Artikal Zalihe"
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5921,7 +5925,7 @@ msgstr "Raspored Amortizacije Imovine"
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr "Raspored Amortizacije Imovine {0} i Finansijski Registar {1} ne koristi amortizaciju zasnovanu na smjenama"
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr "Raspored amortizacije imovine nije pronađen za Imovinu {0} i Finansijski Registar {1}"
@@ -5960,7 +5964,7 @@ msgstr "Odstranjivanje Imovine"
msgid "Asset Finance Book"
msgstr "Registar o Finansijama Imovine"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr "ID Imovine"
@@ -6036,7 +6040,7 @@ msgstr "Zapis o kretanju imovine {0} kreiran"
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr "Naziv Imovine"
@@ -6122,9 +6126,9 @@ msgstr "Status Imovine"
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr "Vrijednost Imovine"
@@ -6153,7 +6157,7 @@ msgstr "Imovina otkazana"
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "Imovina se ne može otkazati, jer je već {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr "Imovina se ne može rashodovati prije posljednjeg unosa amortizacije."
@@ -6185,7 +6189,7 @@ msgstr "Imovina nije u funkciji zbog popravke imovine {0}"
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr "Imovina primljena u {0} i izdata {1}"
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr "Imovina vraćena"
@@ -6197,11 +6201,11 @@ msgstr "Imovina vraćena nakon što je kapitalizacija imovine {0} otkazana"
msgid "Asset returned"
msgstr "Imovina vraćena"
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr "Imovina rashodovana"
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr "Imovina rashodovana putem Naloga Knjiženja {0}"
@@ -6226,7 +6230,7 @@ msgstr "Imovina je ažurirana nakon što je podijeljena na Imovinu {0}"
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr "Imovina ažurirana zbog Popravke Imovine {0} {1}."
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr "Imovina {0} se nemože rashodovati, jer je već {1}"
@@ -6259,7 +6263,15 @@ msgstr "Imovina {0} je ažurirana. Postavi detalje amortizacije ako ih ima i pod
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr "Imovina {0} je u statusu {1} i ne može se popraviti."
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr "Imovina {0} nije postavljena za obračun amortizacije."
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr "Imovina {0} nije podnešena. Podnesi imovinu prije nastavka."
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr "Imovina {0} mora biti podnešena"
@@ -6640,7 +6652,7 @@ msgstr "Automatski Usaglasi"
msgid "Auto Reconcile Payments"
msgstr "Automatski Usaglasi Plaćanja"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr "Automatsko Usaglašavanje"
@@ -6650,7 +6662,7 @@ msgstr "Automatsko Usaglašavanje"
msgid "Auto Reconciliation Job Trigger"
msgstr "Okidač Posla Automatskog Usaglašavanja"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr "Automatsko Usaglašavanje je počelo u pozadini"
@@ -6825,7 +6837,7 @@ msgstr "Dostupna količina Šarže u Skladištu"
msgid "Available Batch Report"
msgstr "Dostupni Izvještaj o Šarži"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr "Datum Dostupnosti za Upotrebu"
@@ -7054,7 +7066,7 @@ msgstr "Sastavnica"
msgid "BOM 1"
msgstr "Sastavnica 1"
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "Sastavnica 1 {0} i Sastavnica 2 {1} ne bi trebali biti isti"
@@ -7292,23 +7304,23 @@ msgstr "Sastavnica ne sadrži nijedan artikal zaliha"
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr "Rekurzija Sastavnice: {0} ne može biti podređena {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr "Rekurzija Sastavnice: {1} ne može biti nadređena ili podređena {0}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr "Sastavnica {0} ne pripada Artiklu {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr "Sastavnica {0} mora biti aktivana"
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr "Sastavnica {0} se mora podnijeti"
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr "Sastavnica {0} nije pronađena za artikal {1}"
@@ -7379,7 +7391,7 @@ msgstr "Stanje"
msgid "Balance (Dr - Cr)"
msgstr "Stanje (Dr - Cr)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr "Stanje ({0})"
@@ -7858,7 +7870,7 @@ msgstr "Osnovna Cijena"
msgid "Base Tax Withholding Net Total"
msgstr "Neto ukupni PDV po odbitku"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr "Osnovni Ukupni Iznos"
@@ -8063,7 +8075,9 @@ msgstr "Status isteka roka Artikla Šarže"
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -8074,7 +8088,7 @@ msgstr "Broj Šarže"
msgid "Batch No is mandatory"
msgstr "Broj Šarže je obavezan"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr "Broj Šarže {0} ne postoji"
@@ -8097,7 +8111,7 @@ msgstr "Broj Šarže"
msgid "Batch Nos"
msgstr "Broj Šarže"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr "Brojevi Šarže su uspješno kreirani"
@@ -8110,7 +8124,7 @@ msgstr "Šarža nije dostupna za povrat"
msgid "Batch Number Series"
msgstr "Serija Imenovanje Šarže"
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr "Količina Šarže"
@@ -8223,7 +8237,7 @@ msgstr "Faktura za odbijenu količinu na Kupovnoj Fakturi"
#. Label of a Card Break in the Manufacturing Workspace
#. Label of a Link in the Manufacturing Workspace
-#: erpnext/manufacturing/doctype/bom/bom.py:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8536,8 +8550,8 @@ msgstr "Ugovorni Nalog Artikal"
msgid "Blanket Order Rate"
msgstr "Cijena po Ugovornom Nalogu"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr "Blokiraj Fakturu"
@@ -8653,7 +8667,7 @@ msgstr "Proknjižena Osnovna Imovina"
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr "Knjiženje vrijednosti zaliha na više računa će otežati praćenje zaliha i vrijednosti računa."
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr "Knjigovodstvo je zatvoreno do perioda koji se završava {0}"
@@ -9427,7 +9441,7 @@ msgstr "Ne može se filtrirati na osnovu Načina Plaćanja, ako je grupirano pre
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr "Ne može se filtrirati na osnovu broja verifikata, ako je grupiran prema verifikatu"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr "Plaćanje se može izvršiti samo protiv nefakturisanog(e) {0}"
@@ -9613,7 +9627,7 @@ msgstr "Nije moguće optimizirati put jer nedostaje adresa vozača."
msgid "Cannot Relieve Employee"
msgstr "Nije moguće razriješiti Personal"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr "Nije moguće ponovo dostaviti unose u Registar za verifikate u završenoj Fiskalnoj Godini."
@@ -9629,6 +9643,10 @@ msgstr "Ne može se primijeniti TDS naspram više strana u jednom unosu"
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr "Ne može biti artikal fiksne imovine jer je kreiran Registar Zaliha."
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr "Nije moguće otkazati raspored amortizacije imovine {0} jer postoji nacrt naloga knjiženja {1}."
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr "Ne može se otkazati Unos Zatvaranja Kase"
@@ -9718,7 +9736,7 @@ msgstr "Nije moguće kreirati povrat za konsolidovanu fakturu {0}."
msgid "Cannot create root account."
msgstr "Nije moguće kreirati osnovni račun."
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr "Sastavnica se nemože deaktivirati ili otkazati jer je povezana sa drugim Sastavnicama"
@@ -9735,7 +9753,7 @@ msgstr "Ne može se odbiti kada je kategorija za 'Vrednovanje' ili 'Vrednovanje
msgid "Cannot delete Exchange Gain/Loss row"
msgstr "Nije moguće izbrisati red Dobitka/Gubitka Deviznog Kursa"
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr "Ne može se izbrisati serijski broj {0}, jer se koristi u transakcijama zaliha"
@@ -10181,11 +10199,11 @@ msgstr "Lanac"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr "Kusur"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr "Promijeni Datum Izdanja"
@@ -10198,7 +10216,7 @@ msgstr "Promijeni Datum Izdanja"
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr "Promjena Vrijednosti Zaliha"
@@ -11006,6 +11024,7 @@ msgstr "Kompanije"
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11153,6 +11172,7 @@ msgstr "Kompanije"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11238,8 +11258,8 @@ msgstr "Kompanije"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11555,7 +11575,7 @@ msgstr "Fiskalni Broj Kompanije"
msgid "Company and Posting Date is mandatory"
msgstr "Kompanija i Datum Knjiženja su obavezni"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr "Valute obje kompanije treba da se podudaraju za međukompanijske transakcije."
@@ -12836,7 +12856,7 @@ msgstr "Troškovi"
#: 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12855,7 +12875,7 @@ msgstr "Troškovi"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -13068,7 +13088,7 @@ msgstr "Nije moguće izbrisati demo podatke"
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr "Nije moguće automatski kreirati klijenta zbog sljedećih nedostajućih obaveznih polja:"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr "Nije moguće automatski kreirati Kreditnu Fakturu, poništi oznaku \"Izdaj Kreditnu Fakturu\" i pošalji ponovo"
@@ -13191,15 +13211,15 @@ msgstr "Cr"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13441,7 +13461,7 @@ msgstr "Kreiraj Priliku"
msgid "Create POS Opening Entry"
msgstr "Kreiraj unos otvaranja Kase"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr "Kreiraj unos Plaćanja"
@@ -13597,7 +13617,7 @@ msgstr "Kreiranje Knjigovodstva u toku..."
msgid "Creating Delivery Note ..."
msgstr "Kreiranje Otpremnice u toku..."
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr "Kreiranje Dimenzija u toku..."
@@ -13617,7 +13637,7 @@ msgstr "Kreiranje Kupovnih Faktura u toku..."
msgid "Creating Purchase Order ..."
msgstr "Kreiranje Kupovnog Naloga u toku..."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13654,11 +13674,6 @@ msgstr "Kreiranje {} od {} {}"
msgid "Creation"
msgstr "Kreacija"
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr "Broj Dokumenta"
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr "Kreiranje {1}(s) uspješno"
@@ -13693,11 +13708,11 @@ msgstr "Kreiranje {0} nije uspjelo.\n"
msgid "Credit"
msgstr "Kredit"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr "Kredit (Transakcija)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr "Kredit ({0})"
@@ -13840,7 +13855,7 @@ msgstr "Kreditna Faktura Izdata"
msgid "Credit Note will update it's own outstanding amount, even if 'Return Against' is specified."
msgstr "Kreditna Faktura će ažurirati svoj nepodmireni iznos, čak i ako je navedeno 'Povrat Naspram'."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr "Kreditna Faktura {0} je kreirana automatski"
@@ -14048,7 +14063,7 @@ msgstr "Kup"
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14147,7 +14162,7 @@ msgstr "Valuta se ne može mijenjati nakon unosa u nekoj drugoj valuti"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr "Valuta za {0} mora biti {1}"
@@ -14497,6 +14512,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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14524,6 +14540,10 @@ msgstr "Klijent / Artikal / Artikal Grupa"
msgid "Customer / Lead Address"
msgstr "Adresa Klijenta/ Potencijalnog Klijenta"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr "Klijent > Grupa Klijenta > Distrikt"
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14925,7 +14945,7 @@ msgstr "Klijent je obavezan za 'Popust na osnovu Klijenta'"
#: 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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr "Klijent {0} ne pripada projektu {1}"
@@ -15277,7 +15297,7 @@ msgstr "Datum Izdavanja"
msgid "Date of Joining"
msgstr "Datum Pridruživanja"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr "Datum Transakcije"
@@ -15414,11 +15434,11 @@ msgstr "Poštovani menadžeru sistema,"
msgid "Debit"
msgstr "Debit"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr "Debit (Transakcija)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr "Debit ({0})"
@@ -15492,7 +15512,7 @@ msgstr "Debit prema"
msgid "Debit To is required"
msgstr "Debit prema je obavezan"
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr "Debit i Kredit nisu isti za {0} #{1}. Razlika je {2}."
@@ -16559,7 +16579,7 @@ msgstr "Demo podaci su obrisani"
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16634,9 +16654,9 @@ msgstr "Amortizacija na osnovu dnevnih proporcija"
msgid "Depreciate based on shifts"
msgstr "Amortizacija na osnovu Smjena"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr "Iznos Amortizacije"
@@ -16692,6 +16712,14 @@ msgstr "Unos Amortizacije"
msgid "Depreciation Entry Posting Status"
msgstr "Status Knjiženja Unosa Amortizacije"
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr "Unos amortizacije za imovinu {0}"
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr "Unos amortizacije za {0} u vrijednosti od {1}"
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16700,7 +16728,7 @@ msgstr "Status Knjiženja Unosa Amortizacije"
msgid "Depreciation Expense Account"
msgstr "Račun Troškova Amortizacije"
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr "Račun Troškova Amortizacije treba da bude račun Prihoda ili Rashoda."
@@ -17586,6 +17614,10 @@ msgstr "Datum Popusta"
msgid "Discount Percentage"
msgstr "Popust Precentualno"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr "Procenat popusta može se primjeniti ili na Cjenovnik ili na sve Cjenovnike."
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr "Procenat Popusta u Transakciji"
@@ -17818,7 +17850,7 @@ msgstr "Postavke Otpreme"
msgid "Disposal Date"
msgstr "Datum Odlaganja"
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr "Datum otuđenja {0} ne može biti prije {1} datuma {2} imovine."
@@ -18098,7 +18130,7 @@ msgstr "Dokumenti"
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr "Dokumenti se obrađuju na svakom okidaču. Veličina Reda treba biti između 5 i 100"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr "Dokumenti: {0} imaju omogućene odgođene prihode/rashode. Ne mogu ponovo objaviti."
@@ -19137,7 +19169,7 @@ msgstr "Prazno"
msgid "Ems(Pica)"
msgstr "Ems (Pica)"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr "Omogući Dozvoli Djelomičnu Rezervaciju u Postavkama Zaliha da rezervišete djelomične zalihe."
@@ -19488,7 +19520,7 @@ msgstr "Unesi naziv za Operaciju, na primjer, Rezanje."
msgid "Enter a name for this Holiday List."
msgstr "Unesi naziv za ovu Listu Praznika."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr "Unesi iznos koji želite iskoristiti."
@@ -19550,7 +19582,7 @@ msgstr "Unesi količinu artikla koja će biti proizvedena iz ovog Spiska Materij
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr "Unesi količinu za proizvodnju. Artikal sirovina će se preuzimati samo kada je ovo podešeno."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr "Unesi {0} iznos."
@@ -19570,7 +19602,7 @@ msgid "Entity"
msgstr "Entitet"
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19665,7 +19697,7 @@ msgstr "Greška pri evaluaciji formule kriterija"
msgid "Error in party matching for Bank Transaction {0}"
msgstr "Greška u podudaranju stranaka za Bankovnu Transakciju {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr "Greška prilikom knjiženja unosa amortizacije"
@@ -19717,11 +19749,9 @@ msgstr "Procijenjeno Vrijeme i Cijena"
msgid "Evaluation Period"
msgstr "Period Evaluacije"
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
-msgstr "Čak i fakture s neprovjerenim PDV po odbitku će se uzeti u obzir za provjeru kumulativnog prekoračenja praga"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
+msgstr "Čak i ako postoji više pravila za određivanje cijena s najvišim prioritetom, primjenjuju se sljedeći interni prioriteti:"
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
@@ -20083,7 +20113,7 @@ msgstr "Očekivana vrijednost nakon korisnog vijeka trajanja"
msgid "Expense"
msgstr "Troškovi"
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr "Račun Rashoda/ Razlike ({0}) mora biti račun 'Dobitka ili Gubitka'"
@@ -20128,7 +20158,7 @@ msgstr "Račun Rashoda/ Razlike ({0}) mora biti račun 'Dobitka ili Gubitka'"
msgid "Expense Account"
msgstr "Račun Troškova"
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr "Nedostaje Račun Troškova"
@@ -20435,7 +20465,7 @@ msgstr "Datum Kvara"
msgid "Failure Description"
msgstr "Opis Kvara"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr "Greška: {0}"
@@ -21111,6 +21141,10 @@ msgstr "Artikal Fiksne Imovine mora biti artikal koja nije na zalihama."
msgid "Fixed Asset Register"
msgstr "Registar Fiksne Imovine"
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr "Osnovno Sredstvo {0} se ne može koristiti u Sastavnicama."
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21241,7 +21275,7 @@ msgstr "Za Standard Dobavljača (Opcija)"
msgid "For Item"
msgstr "Za Artikal"
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr "Za Artikal {0} ne može se primiti više od {1} količine naspram {2} {3}"
@@ -22133,7 +22167,7 @@ msgstr "Referensa Buduće Isplate"
msgid "Future Payments"
msgstr "Buduće Isplate"
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr "Budući datum nije dozvoljen"
@@ -22149,7 +22183,7 @@ msgstr "Stanje Knjigovodstvenog Registra"
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr "Stavka Knjigovodstvenog Registra"
@@ -22415,8 +22449,8 @@ msgid "Get Items"
msgstr "Preuzmi Artikle"
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22775,7 +22809,7 @@ msgstr "Gram/Litar"
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22785,7 +22819,7 @@ msgstr "Gram/Litar"
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22906,8 +22940,8 @@ msgstr "Bruto Rezultat %"
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr "Bruto Iznos Kupovine"
@@ -23258,7 +23292,7 @@ msgstr "Hektopaskal"
msgid "Height (cm)"
msgstr "Visina (cm)"
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr "Zdravo,"
@@ -23297,7 +23331,7 @@ msgstr "Tekst Pomoći"
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr "Pomaže vam da raspodijelite Proračun/Cilj po mjesecima ako imate sezonski karakter u vašem poslovanju."
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr "Ovdje su zapisi grešaka za gore navedene neuspjele unose amortizacije: {0}"
@@ -23393,7 +23427,7 @@ msgstr "Zadrži"
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr "Zadrži Fakturu"
@@ -23487,6 +23521,10 @@ msgstr "Sati"
msgid "Hours Spent"
msgstr "Potrošeni Sati"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr "Kako se primjenjuje cjenovno pravilo?"
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23827,6 +23865,10 @@ msgstr "Ako je postavljeno, sistem će dozvoliti samo korisnicima sa ovom ulogom
msgid "If more than one package of the same type (for print)"
msgstr "Ako je više od jednog pakovanja istog tipa (za ispis)"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr "Ukoliko više cjenovnih pravila nastavljaju da važe, korisnik treba ručno da postavi prioritet radi rješavanja konflikta."
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23843,6 +23885,10 @@ msgstr "Ako ne, možete Otkazati / Podnijeti ovaj unos"
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr "Ako je cijena nula, artikal će se tretirati kao \"Besplatni Artikal\""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr "Ako je odabrano Cijenovno Pravilo napravljeno za 'Cijenu', ono će yamjenuti Cijenovnik. Cijenovno Pravilo cijena je konačna cijena, tako da se ne treba primjenjivati daljnji popust. Stoga će se u transakcijama poput Narudžbenice, Narudžbenice itd., cijena postaviti u polje 'Cijena', a ne u polje 'Cijena Cijenovnika'."
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23925,6 +23971,10 @@ msgstr "Ako je označeno, više materijala se može koristiti za jedan Radni Nal
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr "Ako je označeno, trošak Sastavnice će se automatski ažurirati na osnovu Stope Vrednovanja / Cijene Cijenovnika / posljednje kupovne cijene sirovina."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr "Ako se pronađu dva ili više pravila za određivanje cijena na osnovu gore navedenih uslova, primjenjuje se prioritet. Prioritet je broj između 0 i 20, dok je podrazumijevana vrijednost nula (prazno). Veći broj znači da će imati prioritet ako postoji više pravila za određivanje cijena sa istim uslovima."
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr "Ako je neograničen rok trajanja za bodove lojalnosti, ostavite trajanje isteka praznim ili 0."
@@ -24019,7 +24069,7 @@ msgstr "Zanemari Prazne Zalihe"
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr "Zanemari dnevnike revalorizacije deviznog kursa i rezultata"
@@ -24071,7 +24121,7 @@ msgstr "Zanemari da je Pravilnik Cijena omogućen. Nije moguće primijeniti kod
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr "Zanemari Sistemske Kreditne/Debitne Napomene"
@@ -24834,7 +24884,7 @@ msgstr "Postavke Dolaznog Poziva"
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24907,7 +24957,7 @@ msgstr "Pogrešan Serijski i Šaržni Paket"
msgid "Incorrect Stock Value Report"
msgstr "Netačan Izvještaj o Vrijednosti Zaliha"
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr "Netačan Tip Transakcije"
@@ -25074,13 +25124,13 @@ msgstr "Ubaci Nove Zapise"
msgid "Inspected By"
msgstr "Inspektor"
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr "Inspekcija Odbijena"
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr "Inspekcija Obavezna"
@@ -25097,7 +25147,7 @@ msgstr "Inspekcija Obavezna prije Dostave"
msgid "Inspection Required before Purchase"
msgstr "Inspekcija Obavezna prije Kupovine"
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr "Podnošenje Kontrole"
@@ -25127,7 +25177,7 @@ msgstr "Napomena Instalacije"
msgid "Installation Note Item"
msgstr "Stavka Napomene Instalacije "
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr "Napomena Instalacije {0} je već poslana"
@@ -25185,7 +25235,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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "Nedovoljne Zalihe"
@@ -25376,7 +25426,7 @@ msgstr "Interni Prenosi"
msgid "Internal Work History"
msgstr "Interna Radna Istorija"
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr "Interni prenosi se mogu vršiti samo u standard valuti kompanije"
@@ -25412,7 +25462,7 @@ msgid "Invalid Account"
msgstr "Nevažeći Račun"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr "Nevažeći Dodijeljeni Iznos"
@@ -25440,7 +25490,7 @@ msgstr "Nevažeća narudžba za odabranog Klijenta i Artikal"
msgid "Invalid Child Procedure"
msgstr "Nevažeća Podređena Procedura"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr "Nevažeća kompanija za međukompanijsku transakciju."
@@ -25498,7 +25548,7 @@ msgid "Invalid Ledger Entries"
msgstr "Nevažeći unosi u Registar"
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr "Nevažeći Početni Unos"
@@ -25526,7 +25576,7 @@ msgstr "Nevažeća Primarna Uloga"
msgid "Invalid Priority"
msgstr "Nevažeći Prioritet"
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr "Nevažeća Konfiguracija Gubitka Procesa"
@@ -25610,8 +25660,8 @@ msgstr "Nevažeći upit pretrage"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr "Nevažeća vrijednost {0} za {1} naspram računa {2}"
@@ -25619,7 +25669,7 @@ msgstr "Nevažeća vrijednost {0} za {1} naspram računa {2}"
msgid "Invalid {0}"
msgstr "Nevažeći {0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr "Nevažeći {0} za međukompanijsku transakciju."
@@ -25829,7 +25879,7 @@ msgstr "Fakturisana Količina"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26881,6 +26931,8 @@ msgstr "Artikal Korpe"
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26899,7 +26951,11 @@ msgstr "Kod Artikla"
msgid "Item Code (Final Product)"
msgstr "Kod Artikla (Finalni Proizvod)"
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr "Šifra Artikla > Grupa Artikla > Marka"
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr "Kod Artikla ne može se promijeniti za serijski broj."
@@ -27303,6 +27359,7 @@ msgstr "Proizvođač Artikla"
#: 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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28223,7 +28280,7 @@ msgstr "Naloga Knjiženja za Otpad"
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr "Tip Naloga Knjiženja treba postaviti kao Unos Amortizacije za amortizaciju imovine"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr "Naloga Knjiženja {0} nema račun {1} ili se podudara naspram drugog verifikata"
@@ -28429,7 +28486,7 @@ msgstr "Faktura Dobavljača Kupovna Vrijednost"
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29145,7 +29202,7 @@ msgstr "Lokal"
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29816,7 +29873,7 @@ msgstr "Obavezna Knjigovodstvena Dimenzija"
msgid "Mandatory Depends On"
msgstr "Obavezno zavisi od"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr "Obavezno Polje"
@@ -29906,6 +29963,7 @@ msgstr "Ručni unos se ne može kreirati! Onemogući automatski unos za odgođen
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30464,6 +30522,7 @@ msgid "Material Requested"
msgstr "Materijal Zatražen"
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr "Materijalni Nalozi"
@@ -30819,7 +30878,7 @@ msgstr "Poruka"
msgid "Message Examples"
msgstr "Primjeri poruka"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr "Poruka Poslata"
@@ -31133,8 +31192,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr "Nedostaje Račun"
@@ -31152,6 +31211,10 @@ msgstr "Nedostaje Centar Troškova"
msgid "Missing Default in Company"
msgstr "Nedostaju Standard Postavke u kompaniji"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr "Nedostajući Filteri"
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr "Nedostaje Finansijski Registar"
@@ -31184,7 +31247,7 @@ msgstr "Nedostajuće vrijednosti su obavezne"
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr "Nedostaje šablon e-pošte za otpremu. Molimo postavite jedan u Postavkama Dostave."
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr "Nedostaje vrijednost"
@@ -31850,7 +31913,7 @@ msgstr "Prirodni Gas"
msgid "Needs Analysis"
msgstr "Treba Analiza"
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr "Negativna količina Šarže"
@@ -32282,7 +32345,7 @@ msgstr "Novi Prodajni Nalog"
msgid "New Sales Person Name"
msgstr "Ime Novog Prodavca"
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr "Novi serijski broj ne može imati Skladište. Skladište mora biti postavljeno unosom zaliha ili Kupovnom Priznanicom"
@@ -32318,7 +32381,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 se generirati prema rasporedu čak i ako su trenutne fakture neplaćene ili sa isteklim rokom dospijeća"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr "Novi datum izlaska bi trebao biti u budućnosti"
@@ -32427,7 +32490,7 @@ msgstr "Bez Akcije"
msgid "No Answer"
msgstr "Bez Odgovora"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr "Nije pronađen Klijent za Transakcije Inter Kompanije koji predstavlja kompaniju {0}"
@@ -32484,9 +32547,9 @@ msgstr "Nisu pronađene neplaćene fakture za ovu stranku"
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr "Nije pronađen Kasa profil. Kreiraj novi Kasa Profil"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr "Bez Dozvole"
@@ -32521,7 +32584,7 @@ msgstr "Trenutno nema Dostupnih Zaliha"
msgid "No Summary"
msgstr "Nema Sažetak"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr "Nije pronađen Dobavljač za Transakcije Inter Kompanije koji predstavlja kompaniju {0}"
@@ -32619,7 +32682,7 @@ msgstr "Nema artikala u korpi"
msgid "No items to be received are overdue"
msgstr "Nijedan od artikala za primiti ne kasni"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr "Nije došlo do podudaranja putem automatskog usaglašavanja"
@@ -32753,11 +32816,11 @@ msgstr "Nikakve transakcije Zalihama se ne mogu kreirati ili mijenjati prije ovo
msgid "No values"
msgstr "Bez Vrijednosti"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr "Nisu pronađeni {0} računi za ovu kompaniju."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr "Nije pronađen {0} za transakcije među kompanijama."
@@ -32792,7 +32855,7 @@ msgstr "Ne Amortizirajuća Kategorija"
msgid "Non Profit"
msgstr "Neprofitna"
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr "Artikli za koje se nevode Zalihe"
@@ -32971,7 +33034,7 @@ msgstr "Napomena: Datum dospijeća premašuje dozvoljenih {0} kreditnih dana za
msgid "Note: Email will not be sent to disabled users"
msgstr "Napomena: E-pošta se neće slati onemogućenim korisnicima"
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr "Napomena: Ako želite koristiti gotov proizvod {0} kao sirovinu, označite polje za potvrdu 'Ne Proširuj' u Postavkama Artikla za istu sirovinu."
@@ -32991,7 +33054,7 @@ msgstr "Napomena: Ovaj Centar Troškova je Grupa. Ne mogu se izvršiti knjigovod
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr "Napomena: Da biste spojili artikle, kreirajte zasebno Usaglašavanje Zaliha za stari artikal {0}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr "Napomena: {0}"
@@ -33007,6 +33070,7 @@ msgstr "Napomena: {0}"
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33442,6 +33506,12 @@ msgstr "U transakciji su dozvoljeni samo podređeni članovi"
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr "Samo jedan {0} unos se može kreirati naspram Radnog Naloga {1}"
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr "Samo će se unosi plaćanja kod kojih nije označena opcija \"Primijeni porez po odbitku\" razmatrati za provjeru prekoračenja kumulativnog praga"
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33644,8 +33714,8 @@ msgstr "Početno (Dr)"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr "Početna Akumulirana Amortizacija"
@@ -33687,7 +33757,7 @@ msgstr "Datum Otvaranja"
msgid "Opening Entry"
msgstr "Početni Unos"
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr "Početni Unos ne može se kreirati nakon kreiranja Verifikata Zatvaranje Perioda."
@@ -33715,7 +33785,7 @@ msgid "Opening Invoice Item"
msgstr "Početni Artikal Fakture"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 podešavanje zaokruživanja od {0}.
'{1}' račun je potreban za postavljanje ovih vrijednosti. Molimo postavite ga u kompaniji: {2}.
Ili, '{3}' se može omogućiti da se ne objavljuje nikakvo podešavanje zaokruživanja."
@@ -33789,7 +33859,7 @@ msgstr "Operativni Trošak (Valuta Kompanije)"
msgid "Operating Cost Per BOM Quantity"
msgstr "Operativni trošak po količini Sastavnice"
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr "Operativni Trošak prema Radnom Nalogu / Sastavnici"
@@ -33945,7 +34015,7 @@ msgstr "Operacije"
msgid "Operations Routing"
msgstr "Redoslijed Operacija"
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr "Operacije se ne mogu ostaviti praznim"
@@ -34537,7 +34607,7 @@ msgstr "Dozvola za prekomjernu Dostavu/Primanje (%)"
msgid "Over Picking Allowance"
msgstr "Dozvola za prekomjernu Odabir"
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr "Preko Dostavnice"
@@ -34989,7 +35059,7 @@ msgstr "Upakovani Artikal"
msgid "Packed Items"
msgstr "Upakovani Artikli"
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr "Upakovani Artikli se ne mogu interno prenositi"
@@ -35024,7 +35094,7 @@ msgstr "Otpremnica"
msgid "Packing Slip Item"
msgstr "Artikal Otpremnice"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr "Otpremnica otkazana"
@@ -35110,7 +35180,7 @@ msgstr "Plaćeno"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35385,7 +35455,7 @@ msgstr "Djelomični Prenesen Materijal"
msgid "Partial Payment in POS Transactions are not allowed."
msgstr "Djelomično plaćanje u Kasa Transakcijama nije dozvoljeno."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr "Djelomična Rezervacija Zaliha"
@@ -35579,9 +35649,9 @@ msgstr "Dijelova na Milion"
#: 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35742,9 +35812,9 @@ msgstr "Specifični Artikal 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35909,7 +35979,7 @@ msgstr "Postavke Platitelja"
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -36045,7 +36115,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr "Unos plaćanja je izmijenjen nakon što ste ga povukli. Molim te povuci ponovo."
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr "Unos plaćanja je već kreiran"
@@ -36254,7 +36324,7 @@ msgstr "Reference Uplate"
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36280,11 +36350,11 @@ msgstr "Tip Zahtjeva Plaćanja"
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr "Platni Nalog je kreiran iz Prodajnog ili Kupovnog Naloga bit će u statusu Nacrta. Kada je onemogućen, dokument će biti u nespremljnom stanju."
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr "Platni Zahtjev za {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr "Platni Zahtjev je već kreiran"
@@ -36442,7 +36512,7 @@ msgstr "URL Plaćanja"
msgid "Payment Unlink Error"
msgstr "Greška Otkazivanja Veze"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr "Plaćanje naspram {0} {1} ne može biti veće od Nepodmirenog Iznosa {2}"
@@ -36763,7 +36833,7 @@ msgstr "Period"
msgid "Period Based On"
msgstr "Period na Osnovu"
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr "Period Zatvoren"
@@ -37366,7 +37436,7 @@ msgstr "Dodaj Račun Matičnoj Kompaniji - {}"
msgid "Please add {1} role to user {0}."
msgstr "Dodaj {1} ulogu korisniku {0}."
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr "Podesi količinu ili uredi {0} da nastavite."
@@ -37374,7 +37444,7 @@ msgstr "Podesi količinu ili uredi {0} da nastavite."
msgid "Please attach CSV file"
msgstr "Priložite CSV datoteku"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr "Poništi i Izmijeni Unos Plaćanja"
@@ -37387,7 +37457,7 @@ msgstr "Ručno otkaži Unos Plaćanja"
msgid "Please cancel related transaction."
msgstr "Otkaži povezanu transakciju."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr "Odaberi opciju Više Valuta da dozvolite račune u drugoj valuti"
@@ -37464,7 +37534,7 @@ msgstr "Kreiraj Kupovni Račun ili Kupovnu Fakturu za artikal {0}"
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr "Izbriši Artikal Paket {0}, prije spajanja {1} u {2}"
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr "Privremeno onemogući tok rada za Nalog Knjiženja {0}"
@@ -37588,7 +37658,7 @@ msgstr "Unesi Kupovni Račun"
msgid "Please enter Receipt Document"
msgstr "Unesi Kupovni Račun"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr "Unesi Referentni Datum"
@@ -37713,8 +37783,8 @@ msgstr "Da li zaista želiš izbrisati sve transakcije za ovu kompaniju. Vaši g
msgid "Please mention 'Weight UOM' along with Weight."
msgstr "Navedi 'Jedinicu Težine' zajedno s Težinom."
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr "Navedi '{0}' u kompaniji: {1}"
@@ -37842,7 +37912,7 @@ msgstr "Odaberi Datum knjiženja prije odabira Stranke"
msgid "Please select Posting Date first"
msgstr "Odaberi Datum Knjiženja"
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr "Odaberi Cjenovnik"
@@ -37874,7 +37944,7 @@ msgstr "Odaberi Podizvođački umjesto Kupovnog Naloga {0}"
msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
msgstr "Odaberi Račun Nerealiziranog Rezultata ili postavi Standard Račun Nerealiziranog Rezultata za kompaniju {0}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr "Odaberi Sastavnicu"
@@ -37964,6 +38034,10 @@ msgstr "Odaberi Vrijednost za {0} Ponuda za {1}"
msgid "Please select an item code before setting the warehouse."
msgstr "Odaberite kod artikla prije postavljanja skladišta."
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:26
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr "Odaberi barem jedan filter: Šifra Artikla, Šarža ili Serijski Broj."
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr "Odaberi jedan artikal za nastavak"
@@ -37972,7 +38046,7 @@ msgstr "Odaberi jedan artikal za nastavak"
msgid "Please select atleast one operation to create Job Card"
msgstr "Odaberi barem jednu operaciju za kreiranje kartice posla"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr "Odaberi tačan račun"
@@ -38053,15 +38127,15 @@ msgstr "Odaberi {0}"
msgid "Please set 'Apply Additional Discount On'"
msgstr "Postavi 'Primijeni Dodatni Popust Na'"
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr "Postavi 'Centar Troškova Amortizacije Imovine' u kompaniji {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr "Postavi 'Račun Rezultata Prilikom Odlaganja Imovine' u Kompaniji {0}"
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr "Postavi '{0}' u Kompaniji: {1}"
@@ -38069,7 +38143,7 @@ msgstr "Postavi '{0}' u Kompaniji: {1}"
msgid "Please set Account"
msgstr "Postavi Račun"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr "Postavi Račun za Kusur"
@@ -38095,7 +38169,7 @@ msgstr "Postavi Knjigovodstvenu Dimenziju {} u {}"
msgid "Please set Company"
msgstr "Postavi Kompaniju"
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr "Postavi račune koji se odnose na Amortizaciju u Kategoriji Imovine {0} ili Kompanije {1}"
@@ -38113,7 +38187,7 @@ msgstr "Postavi Fiskalni Kod za Klijenta '%s'"
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr "Postavi Fiskalni Kod za Javnu Upravu '%s'"
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr "Postavi Račun Osnovne Imovine u Kategoriju Imovine {0}"
@@ -38176,7 +38250,7 @@ msgstr "Postavi Račun u Skladištu {0}"
msgid "Please set an Address on the Company '%s'"
msgstr "Postavi Adresu Kompanije '%s'"
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr "Postavi Račun Troškova u tabeli Artikala"
@@ -38192,23 +38266,23 @@ msgstr "Postavi barem jedan red u Tabeli PDV-a i Naknada"
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr "Postavi i Porezni i Fiskalni broj za {0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr "Postavi Standard Gotovinski ili Bankovni Račun za Način Plaćanja {0}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr "Postavi Standard Gotovinski ili Bankovni Račun za Način Plaćanja {}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "Postavi Standard Gotovinski ili Bankovni Račun za Načine Plaćanja {}"
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr "Postavi Standard Račun Rezultata u Kompaniji {}"
@@ -38312,7 +38386,7 @@ msgstr "Postavi {0} na {1}, isti račun koji je korišten u originalnoj fakturi
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr "Podesi i omogući grupni račun sa Kontnom Klasom - {0} za Kompaniju {1}"
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr "Podijeli ovu e-poštu sa svojim timom za podršku kako bi mogli pronaći i riješiti problem."
@@ -38325,7 +38399,7 @@ msgid "Please specify Company"
msgstr "Navedi Kompaniju"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr "Navedi Kompaniju da nastavite"
@@ -38498,6 +38572,7 @@ msgstr "Poštanski Troškovi"
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38532,11 +38607,11 @@ 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38555,6 +38630,7 @@ msgstr "Poštanski Troškovi"
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38564,6 +38640,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_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
@@ -39129,6 +39206,14 @@ msgstr "Kod Artikla Pravila Određivanja Cijena"
msgid "Pricing Rule Item Group"
msgstr "Grupa Artikal Pravila Određivanja Cijena"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr "Cijenovno Pravilo se prvo bira na osnovu polja 'Primijeni na', koje može biti Artikal, Grupa Artikla ili Marka."
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr "Cijenovno Pravilo je napravljeno da zamjeni cijenovnik / definiše procenat popusta, na osnovu određenih kriterija."
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr "Pravilo Određivanja Cijena {0} je ažurirano"
@@ -39187,6 +39272,10 @@ msgstr "Pravilo Određivanja Cijena {0} je ažurirano"
msgid "Pricing Rules"
msgstr "Pravila Određivanja Cijena"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr "Cijenovna Pravila se dalje filtriraju na osnovu količine."
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39574,7 +39663,7 @@ msgstr "Opis Procesa"
msgid "Process Loss"
msgstr "Procesni Gubitak"
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr "Procentualni Gubitka Procesa ne može biti veći od 100"
@@ -40064,7 +40153,7 @@ msgstr "Napredak (%)"
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40539,7 +40628,7 @@ msgstr "Analiza Kupovine"
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr "Datum Kupovine"
@@ -40695,7 +40784,7 @@ msgstr "Glavni Upravitelj Nabave"
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40871,9 +40960,9 @@ msgstr "Kupovni Cijenovnik"
#. 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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41754,6 +41843,7 @@ msgstr "Cilj Revizije 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/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
@@ -41870,7 +41960,7 @@ msgstr "Količina ne smije biti veća od {0}"
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr "Količina artikla dobijena nakon proizvodnje/prepakivanja od datih količina sirovina"
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr "Obavezna Količina za Artikal {0} u redu {1}"
@@ -42719,7 +42809,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:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "Razlog za Stavljanje Na Čekanje"
@@ -43155,7 +43245,7 @@ msgstr "Iskoristi Naspram"
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr "Iskoristi Bodove Lojalnosti"
@@ -43287,7 +43377,7 @@ msgstr "Referentni Datum"
msgid "Reference"
msgstr "Referenca"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr "Referenca #{0} datirana {1}"
@@ -43425,7 +43515,7 @@ msgstr "Referentni Naziv"
msgid "Reference No"
msgstr "Referentni Broj"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr "Referentni Broj & Referentni Datum su obavezni za {0}"
@@ -43433,11 +43523,11 @@ msgstr "Referentni Broj & Referentni Datum su obavezni za {0}"
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr "Referentni Broj i Referentni Datum su obavezni za Bankovnu Transakciju"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr "Referentni Broj je obavezan ako ste unijeli Referentni Datum"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr "Referentni Broj"
@@ -43551,11 +43641,11 @@ msgstr "Referenca: {0}, Artikal Kod: {1} i Klijent: {2}"
msgid "References"
msgstr "Reference"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr "Reference na Prodajne Fakture su Nepotpune"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr "Reference na Prodajne Naloge su Nepotpune"
@@ -43700,8 +43790,8 @@ msgstr "U Relaciji"
#. 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43720,7 +43810,7 @@ msgstr "Datum Otkaza"
msgid "Remaining"
msgstr "Preostalo"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr "Preostali Iznos"
@@ -43733,7 +43823,7 @@ msgstr "Preostalo Stanje"
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr "Napomena"
@@ -43782,7 +43872,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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -44094,7 +44184,7 @@ msgstr "Artikal Ponovnog Knjiženja Registra Plaćanja"
msgid "Repost Status"
msgstr "Status Ponovnog Knjiženja"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr "Ponovno Knjiženje je započeto u pozadini"
@@ -44418,7 +44508,7 @@ msgstr "Ponovo odaberi, ako je odabrani kontakt izmenjen nakon čuvanja"
msgid "Reseller"
msgstr "Preprodavač"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr "Ponovo pošaljite e-poštu za plaćanje"
@@ -44887,7 +44977,7 @@ msgstr "Povrat"
msgid "Return / Credit Note"
msgstr "Povrat / Kreditna Faktura"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr "Povrat / Debit Faktura"
@@ -45411,12 +45501,12 @@ 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/sales_invoice/sales_invoice.py:1920
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1919
msgid "Row #{0} (Payment Table): Amount must be negative"
msgstr "Red #{0} (Tabela Plaćanja): Iznos mora da je negativan"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:515
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "Red #{0} (Tabela Plaćanja): Iznos mora da je pozitivan"
@@ -45562,7 +45652,7 @@ msgstr "Red #{0}: Duplikat unosa u Referencama {1} {2}"
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr "Red #{0}: Očekivani Datum Isporuke ne može biti prije datuma Kupovnog Naloga"
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr "Red #{0}: Račun Troškova nije postavljen za artikal {1}. {2}"
@@ -45586,11 +45676,11 @@ msgstr "Red #{0}: Gotov Proizvod mora biti {1}"
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr "Red #{0}: Gotov Proizvod referenca je obavezna za Otpadni Artikal {1}."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr "Red #{0}: Za {1}, možete odabrati referentni dokument samo ako je račun kreditiran"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr "Red #{0}: Za {1}, možete odabrati referentni dokument samo ako račun bude zadužen"
@@ -45610,7 +45700,7 @@ msgstr "Red #{0}: Artikel je dodan"
msgid "Row #{0}: Item {1} does not exist"
msgstr "Red #{0}: Artikel {1} ne postoji"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr "Red #{0}: Artikal {1} je odabran, rezerviši zalihe sa Liste Odabira."
@@ -45646,7 +45736,7 @@ msgstr "Red #{0}: Sljedeći datum amortizacije ne može biti prije datuma kupovi
msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
msgstr "Red #{0}: Nije dozvoljeno mijenjati dobavljača jer Kupovni Nalog već postoji"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr "Red #{0}: Samo {1} je dostupno za rezervisanje za artikal {2}"
@@ -45691,15 +45781,15 @@ msgstr "Red #{0}: Količina mora biti pozitivan broj"
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 bi trebala biti manja ili jednaka Dostupnoj Količini za Rezervaciju (stvarna količina - rezervisana količina) {1} za artikal {2} naspram Šarže {3} u Skladištu {4}."
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr "Red #{0}: Kontrola Kvaliteta je obavezna za artikal {1}"
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr "Red #{0}: Kontrola Kvaliteta {1} nije dostavljena za artikal: {2}"
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr "Red #{0}: Kontrola Kvaliteta {1} je odbijena za artikal {2}"
@@ -45708,7 +45798,7 @@ msgstr "Red #{0}: Kontrola Kvaliteta {1} je odbijena za artikal {2}"
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "Red #{0}: Količina za artikal {1} ne može biti nula."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr "Red #{0}: Količina koju treba rezervisati za artikal {1} treba biti veća od 0."
@@ -45805,19 +45895,19 @@ msgstr "Red #{0}: Status mora biti {1} za popust na fakturi {2}"
msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}."
msgstr "Red #{0}: Zaliha se ne može rezervisati za artikal {1} naspram onemogućene Šarže {2}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr "Red #{0}: Zalihe se ne mogu rezervirati za artikal bez zaliha {1}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr "Red #{0}: Zalihe se ne mogu rezervisati u grupnom skladištu {1}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr "Red #{0}: Zaliha je već rezervisana za artikal {1}."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr "Red #{0}: Zalihe su rezervisane za artikal {1} u skladištu {2}."
@@ -45825,8 +45915,8 @@ msgstr "Red #{0}: Zalihe su rezervisane za artikal {1} u skladištu {2}."
msgid "Row #{0}: Stock not available to reserve for Item {1} against Batch {2} in Warehouse {3}."
msgstr "Red #{0}: Zaliha nije dostupna za rezervisanje za artikal {1} naspram Šarže {2} u Skladištu {3}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr "Red #{0}: Zaliha nije dostupna za rezervisanje za artikal {1} u skladištu {2}."
@@ -46007,7 +46097,7 @@ msgstr "Red {0}# Artikal {1} nije pronađen u tabeli 'Isporučene Sirovine' u {2
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr "Red {0}: Prihvaćena Količina i Odbijena Količina ne mogu biti nula u isto vrijeme."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr "Red {0}: Račun {1} i Tip Stranke {2} imaju različite tipove računa"
@@ -46015,11 +46105,11 @@ msgstr "Red {0}: Račun {1} i Tip Stranke {2} imaju različite tipove računa"
msgid "Row {0}: Activity Type is mandatory."
msgstr "Red {0}: Tip Aktivnosti je obavezan."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr "Red {0}: Predujam naspram Klijenta mora biti kredit"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr "Red {0}: Predujam naspram Dobavljača mora biti debit"
@@ -46039,7 +46129,7 @@ msgstr "Red {0}: Kako je {1} omogućen, sirovine se ne mogu dodati u {2} unos. K
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr "Red {0}: Sastavnica nije pronađena za Artikal {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr "Red {0}: Vrijednosti debita i kredita ne mogu biti nula"
@@ -46055,7 +46145,7 @@ msgstr "Red {0}: Centar Troškova {1} ne pripada kompaniji {2}"
msgid "Row {0}: Cost center is required for an item {1}"
msgstr "Red {0}: Centar Troškova je obaveyan za artikal {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr "Red {0}: Unos kredita ne može se povezati sa {1}"
@@ -46063,7 +46153,7 @@ msgstr "Red {0}: Unos kredita ne može se povezati sa {1}"
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr "Red {0}: Valuta Sastavnice #{1} bi trebala biti jednaka odabranoj valuti {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr "Red {0}: Unos debita ne može se povezati sa {1}"
@@ -46079,7 +46169,7 @@ msgstr "Red {0}: Datum roka plaćanja u tabeli Uslovi Plaćanja ne može biti pr
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr "Red {0}: Ili je Artikal Dostavnice ili Pakirani Artikal referenca obavezna."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "Red {0}: Devizni Kurs je obavezan"
@@ -46113,7 +46203,7 @@ msgstr "Red {0}: Od vremena i do vremena je obavezano."
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr "Red {0}: Od vremena i do vremena {1} se preklapa sa {2}"
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr "Red {0}: Iz skladišta je obavezano za interne prijenose"
@@ -46125,7 +46215,7 @@ msgstr "Red {0}: Od vremena mora biti prije do vremena"
msgid "Row {0}: Hours value must be greater than zero."
msgstr "Red {0}: Vrijednost sati mora biti veća od nule."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr "Red {0}: Nevažeća referenca {1}"
@@ -46149,7 +46239,7 @@ msgstr "Red {0}: Artikal {1} mora biti podugovorni artikal."
msgid "Row {0}: Item {1}'s quantity cannot be higher than the available quantity."
msgstr "Red {0}: Količina Artikla {1} ne može biti veća od raspoložive količine."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr "Red {0}: Pakovana Količina mora biti jednaka {1} Količini."
@@ -46157,7 +46247,7 @@ msgstr "Red {0}: Pakovana Količina mora biti jednaka {1} Količini."
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr "Red {0}: Otpremnica je već kreirana za artikal {1}."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr "Red {0}: Strana/ Račun se ne podudara sa {1} / {2} u {3} {4}"
@@ -46169,11 +46259,11 @@ msgstr "Red {0}: Tip Stranke i Stranka su obavezni za Račun Potraživanja / Pla
msgid "Row {0}: Payment Term is mandatory"
msgstr "Red {0}: Uslov Plaćanja je obavezan"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr "Red {0}: Plaćanje naspram Prodajnog/Kupovnog Naloga uvijek treba navesti kao predujam"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr "Red {0}: Provjeri 'Predujam' naspram računa {1} ako je ovo predujam unos."
@@ -46241,7 +46331,7 @@ msgstr "Red {0}: Smjena se ne može promijeniti jer je amortizacija već obrađe
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr "Red {0}: Podugovorni Artikal je obavezan za sirovinu {1}"
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr "Red {0}: Ciljno Skladište je obavezno za interne transfere"
@@ -46265,7 +46355,7 @@ msgstr "Red {0}: Za postavljanje {1} periodičnosti, razlika između od i do dat
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "Red {0}: Jedinični Faktor Konverzije je obavezan"
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: 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 Tip Radne Stanice je obavezan za operaciju {1}"
@@ -46286,7 +46376,7 @@ msgstr "Red {0}: {1} mora biti veći od 0"
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr "Red {0}: {1} {2} ne može biti isto kao {3} (Račun Stranke) {4}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr "Red {0}: {1} {2} se ne podudara sa {3}"
@@ -46679,7 +46769,7 @@ msgstr "Prodajna Faktura nije kreirana od {}"
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr "U Kasi je aktiviran način Prodajne Fakture. Umjesto toga kreiraj Prodajnu Fakturu."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr "Prodajna Faktura {0} je već podnešena"
@@ -46908,7 +46998,7 @@ msgstr "Status Prodajnog Naloga"
msgid "Sales Order Trends"
msgstr "Trendovi Prodajnih Naloga"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr "Prodajni Nalog je obavezan za Artikal {0}"
@@ -47418,8 +47508,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47692,7 +47782,7 @@ msgstr "Trošak Otpadnog Materijala (Valuta Kompanije)"
msgid "Scrap Warehouse"
msgstr "Otpadno Skladište"
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr "Datum Rashodovanja ne može biti prije Datuma Kupovine"
@@ -47765,7 +47855,7 @@ msgstr "Sekretar(ica)"
msgid "Section"
msgstr "Sekcija"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr "Kod Sekcije"
@@ -48136,7 +48226,7 @@ msgstr "Odaberi, kako bi mogao pretraživati klijenta pomoću ovih polja"
msgid "Selected POS Opening Entry should be open."
msgstr "Odabrani Početni Unos Kase bi trebao biti otvoren."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr "Odabrani Cijenovnik treba da ima označena polja za Kupovinu i Prodaju."
@@ -48320,7 +48410,7 @@ msgstr "Pošalji sa Prilogom"
msgid "Sender"
msgstr "Pošiljalac"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr "Šalje se"
@@ -48444,7 +48534,9 @@ msgstr "Serijski / Šaržni Broj"
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48475,7 +48567,9 @@ msgid "Serial No Count"
msgstr "Broj Serijskog Broja"
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr "Serijski Broj Registar"
@@ -48483,7 +48577,7 @@ msgstr "Serijski Broj Registar"
msgid "Serial No Range"
msgstr "Serijski Broj Raspon"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr "Rezervisan Serijski Broj"
@@ -48523,6 +48617,13 @@ msgstr "Serijski Broj i Šarža"
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr "Serijski Broj i odabirač Šarže ne mogu se koristiti kada je omogućeno Koristi Serijski Broj / Šaržna Polja."
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr "Pratljivost Serijskog Broja i Šarže"
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr "Serijski Broj je Obavezan"
@@ -48552,7 +48653,7 @@ msgstr "Serijski Broj {0} ne pripada Artiklu {1}"
msgid "Serial No {0} does not exist"
msgstr "Serijski Broj {0} ne postoji"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr "Serijski Broj {0} ne postoji"
@@ -48601,7 +48702,7 @@ msgstr "Serijski Broj / Šaržni Broj"
msgid "Serial Nos and Batches"
msgstr "Serijski Brojevi & Šarže"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr "Serijski Brojevi su uspješno kreirani"
@@ -48679,11 +48780,11 @@ msgstr "Serijski i Šarža"
msgid "Serial and Batch Bundle"
msgstr "Serijski i Šaržni Paket"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr "Serijski i Šaržni Paket je kreiran"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr "Serijski i Šaržni Paket je ažuriran"
@@ -49117,7 +49218,7 @@ msgstr "Odredi obračunatu cijenu na temelju cijene Kupovne Fakture"
msgid "Set Loyalty Program"
msgstr "Postavi Program Lojalnosti"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr "Postavi Novi Datum Izdavanja"
@@ -49372,7 +49473,7 @@ msgstr "Postavljanje računa kao Računa Kompanije je neophodno za Bankovno Usag
msgid "Setting up company"
msgstr "Postavljanje Kompanije"
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr "Podešavanje {0} je neophodno"
@@ -49556,7 +49657,7 @@ msgstr "Tip Pošiljke"
msgid "Shipment details"
msgstr "Detalji Pošiljke"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr "Pošiljke"
@@ -49803,6 +49904,10 @@ msgstr "Prikaži Otkazane Unose"
msgid "Show Completed"
msgstr "Prikaži Završeno"
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr "Prikaži Kredit / Debit u valuti kompanije"
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr "Prikaži Kumulativni Iznos"
@@ -49918,7 +50023,7 @@ msgstr "Prikaži Pregled"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr "Prikaži Napomene"
@@ -50225,13 +50330,27 @@ msgstr "Izvor"
msgid "Source DocType"
msgstr "Izvorni DocType"
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr "Izvorni Dokument"
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr "Naziv Izvornog Dokumenta"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr "Broj Izvornog Dokumenta"
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr "Tip Izvornog Dokumenta"
@@ -50302,7 +50421,7 @@ msgstr "Adresa Izvornog Skladišta"
msgid "Source Warehouse Address Link"
msgstr "Veza Adrese Izvornog Skladišta"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr "Izvorno Skladište je obavezno za Artikal {0}."
@@ -50813,7 +50932,7 @@ msgstr "Država/Pokrajina"
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51156,7 +51275,7 @@ msgstr "Unos Zaliha {0} je kreiran"
msgid "Stock Entry {0} has created"
msgstr "Unos Zaliha {0} je kreiran"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr "Unos Zaliha {0} nije podnešen"
@@ -51379,13 +51498,13 @@ msgstr "Postavke Ponovnog Knjiženja Zaliha"
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51394,13 +51513,13 @@ msgstr "Postavke Ponovnog Knjiženja Zaliha"
msgid "Stock Reservation"
msgstr "Rezervacija Zaliha"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr "Otkazani Unosi Rezervacije Zaliha"
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr "Kreirani Unosi Rezervacija Zaliha"
@@ -51422,7 +51541,7 @@ msgstr "Unos Rezervacije Zaliha ne može se ažurirati pošto je već dostavljen
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 naspram Liste Odabira ne može se ažurirati. Ako trebate napraviti promjene, preporučujemo da poništite postojeći unos i kreirate novi."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr " Neusklađeno Skladišta Rezervacije Zaliha"
@@ -51667,7 +51786,7 @@ msgstr "Zalihe i Proizvodnja"
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr "Zalihe se ne mogu rezervisati u grupnom skladištu {0}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr "Zalihe se ne mogu rezervisati u grupnom skladištu {0}."
@@ -51683,7 +51802,7 @@ msgstr "Zalihe se ne mogu ažurirati naspram sljedećih Dostavnica: {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 se ne mogu ažurirati jer Faktura sadrži artikal direktne dostave. Onemogući 'Ažuriraj Zalihe' ili ukloni artikal direktne dostave."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr "Rezervisana Zaliha je poništena za Radni Nalog {0}."
@@ -52551,10 +52670,15 @@ msgstr "Dostavljena 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "Dobavljač"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr "Dobavljač > Tip Dobavljača"
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52667,7 +52791,7 @@ msgstr "Faktura Dobavljača"
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr "Datum Fakture Dobavljaća"
@@ -52681,8 +52805,8 @@ msgstr "Datum Fakture Dobavljača ne može biti kasnije od Datuma Knjiženja"
#: 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "Broj Fakture Dobavljača"
@@ -53230,16 +53354,16 @@ msgstr "Sistem neće provjeravati prekomjerno fakturisanje jer je iznos za Artik
msgid "System will notify to increase or decrease quantity or amount "
msgstr "Sistem će obavijestiti da li da se poveća ili smanji količinu ili iznos "
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr "Iznos PDV-a po odbitku (TCS)"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr "Stopa poreza po odbitku (TCS) %"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr "Iznos poreza po odbitku (TDS)"
@@ -53256,7 +53380,7 @@ msgstr "Odbijen porez po odbitku (TDS)"
msgid "TDS Payable"
msgstr "Dospjeli porez po odbitku (TDS)."
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr "Stopa poreza po odbitku (TDS) %"
@@ -53812,7 +53936,7 @@ msgstr "Tip PDV-a"
msgid "Tax Withheld Vouchers"
msgstr "Verifikati PDV Odbitka"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr "PDV Odbitak"
@@ -54438,7 +54562,7 @@ msgstr "Pristup zahtjevu za ponudu sa portala je onemogućen. Da biste omogućil
msgid "The BOM which will be replaced"
msgstr "Sastavnica koja će biti zamijenjena"
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr "Šarća {0} ima negativnu količinu {1} u skladištu {2}. Ispravi količinu."
@@ -54466,7 +54590,7 @@ msgstr "Knjigovodstveni Unosi će biti otkazani u pozadini, može potrajati neko
msgid "The Loyalty Program isn't valid for the selected company"
msgstr "Program Lojalnosti ne važi za odabranu kompaniju"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr "Zahtjev Plaćanja {0} je već plaćen, ne može se obraditi plaćanje dvaput"
@@ -54490,7 +54614,7 @@ msgstr "Prodavač je povezan sa {0}"
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr "Serijski Broj u redu #{0}: {1} nije dostupan u skladištu {2}."
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr "Serijski Broj {0} je rezervisan naspram {1} {2} i ne može se koristiti za bilo koju drugu transakciju."
@@ -54512,7 +54636,7 @@ msgstr "Radni Nalog je obavezan za Demontažni Nalog"
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr "Računa pod Obavezama ili Kapitalom, u kojoj će se knjižiti Rezultat"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr "Dodijeljeni iznos je veći od nepodmirenog iznosa Zahtjeva Plaćanja {0}"
@@ -54553,7 +54677,7 @@ msgstr "Polje Od Dioničara ne može biti prazno"
msgid "The field To Shareholder cannot be blank"
msgstr "Polje Za Dioničara ne može biti prazno"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr "Polje {0} u redu {1} nije postavljeno"
@@ -54569,7 +54693,7 @@ msgstr "Brojevi Folija se ne podudaraju"
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr "Sljedeći artikl, koji imaju Pravila Odlaganju, nisu mogli biti prihvaćeni:"
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr "Sljedeća imovina nije uspjela automatski knjižiti unose amortizacije: {0}"
@@ -54830,6 +54954,10 @@ msgstr "{0} {1} se ne poklapa s {0} {2} u {3} {4}"
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr "{0} {1} se koristi za izračunavanje troška vrednovanja za gotov proizvod {2}."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc."
+msgstr "Zatim se cijenovna pravila filtriraju na osnovu klijenta, grupe klijenta, distrikta, dobavljača, tipa dobavljača, kampanje, prodajnog partnera itd."
+
#: erpnext/assets/doctype/asset/asset.py:579
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr "Postoji aktivno održavanje ili popravke imovine naspram imovine. Morate ih ispuniti sve prije nego što otkažete imovinu."
@@ -55096,7 +55224,7 @@ msgstr "Ovaj raspored je kreiran kada je Imovina {0} vraćena u prvobitno stanje
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr "Ovaj raspored je kreiran kada je imovina {0} vraćena nakon otkazivanja kapitalizacije imovine {1}."
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr "Ovaj raspored je kreiran kada je Imovina {0} vraćena."
@@ -55104,7 +55232,7 @@ msgstr "Ovaj raspored je kreiran kada je Imovina {0} vraćena."
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr "Ovaj raspored je kreiran kada je imovina {0} vraćena putem Prodajne Fakture {1}."
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr "Ovaj raspored je kreiran kada je imovina {0} rashodovana."
@@ -55879,6 +56007,10 @@ msgstr "Da biste uključili PDV u red {0} u cijenu artikla, PDV u redovima {1} t
msgid "To merge, following properties must be same for both items"
msgstr "Za spajanje, sljedeća svojstva moraju biti ista za obje stavke"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr "Da se cijenovno pravilo ne primjeni u određenoj transakciji, sva primenjiva cijenovna pravila treba onemogućiti."
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr "Da poništite ovo, omogući '{0}' u kompaniji {1}"
@@ -55896,7 +56028,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr "Da biste podnijeli Fakturu bez Kupovnog Računa, postavite {0} kao {1} u {2}"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr "Da biste koristili drugi Finansijski Registar, poništi 'Uključi Standard Imovinu Finansijskog Registra'"
@@ -56118,7 +56250,7 @@ msgstr "Ukupno Dodjeljeno"
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56280,7 +56412,7 @@ msgstr "Ukupni iznos Kredita/Debita trebao bi biti isti kao povezani Nalog Knji
msgid "Total Debit"
msgstr "Ukupan Debit"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr "Ukupan Debit mora biti jednak Ukupnom Kreditu. Razlika je {0}"
@@ -56873,6 +57005,10 @@ msgstr "Ukupno"
msgid "Traceability"
msgstr "Sljedivost"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr "Smjer Pratljivosti"
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56913,7 +57049,7 @@ msgstr "URL Praćenja"
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -57011,7 +57147,7 @@ msgstr "Postavke Transakcije"
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr "Tip Transakcije"
@@ -57033,7 +57169,7 @@ msgstr "Referentni broj transakcije {0} datiran {1}"
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57630,7 +57766,11 @@ msgstr "Nedodjeljeni Iznos"
msgid "Unassigned Qty"
msgstr "Nedodijeljena Količina"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr "Nefakturisani Nalozi"
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr "Deblokiraj Fakturu"
@@ -58997,7 +59137,7 @@ msgstr "Faktura Dobavljača"
msgid "Vendor Invoices"
msgstr "Fakture Dobavljača"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr "Ime Dobavljača"
@@ -59064,7 +59204,7 @@ msgstr "Video Postavke"
#: 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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59255,11 +59395,11 @@ msgstr "Naziv Verifikata"
#: 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59294,7 +59434,7 @@ msgstr "Količina"
#. 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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr "Podtip Verifikata"
@@ -59326,9 +59466,9 @@ msgstr "Podtip Verifikata"
#: 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59347,6 +59487,7 @@ msgstr "Podtip Verifikata"
#: 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_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
@@ -59556,6 +59697,7 @@ msgstr "Spontana Posjeta"
#: 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_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
@@ -59664,7 +59806,7 @@ msgstr "Skladište i Referenca"
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr "Skladište se ne može izbrisati jer postoji unos u registru zaliha za ovo skladište."
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr "Skladište se ne može promijeniti za Serijski Broj."
@@ -59677,7 +59819,7 @@ msgid "Warehouse not found against the account {0}"
msgstr "Skladište nije pronađeno naspram računu {0}"
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr "Skladište je obavezno za artikal zaliha {0}"
@@ -59828,7 +59970,7 @@ msgstr "Upozorenje na Negativnu Zalihu"
msgid "Warning!"
msgstr "Upozorenje!"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr "Upozorenje: Još jedan {0} # {1} postoji naspram unosa zaliha {2}"
@@ -60311,6 +60453,7 @@ msgstr "Skladište Posla u Toku"
#: 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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "Radni Nalog"
@@ -60786,7 +60929,7 @@ msgstr "Uvoziš podatke za Listu Koda:"
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr "Nije vam dozvoljeno ažuriranje prema uslovima postavljenim u {} Radnom Toku."
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr "Niste ovlašteni da dodajete ili ažurirate unose prije {0}"
@@ -60818,7 +60961,7 @@ msgstr "Također možete postaviti standard Račun Kapitalnog Posla u Toku u kom
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr "Možete promijeniti nadređeni račun u račun Bilansa Stanja ili odabrati drugi račun."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr "Ne možete unijeti trenutni verifikat u kolonu 'Naspram Naloga Knjiženja'"
@@ -60835,7 +60978,7 @@ msgstr "Ovim redom možete iskoristiti najviše {0} bodova."
msgid "You can only select one mode of payment as default"
msgstr "Možete odabrati samo jedan način plaćanja kao standard"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr "Možete iskoristiti do {0}."
@@ -60867,11 +61010,11 @@ msgstr "Ne možete kreirati {0} unutar zatvorenog Knjigovodstvenog Perioda {1}"
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr "Ne možete kreirati ili poništiti bilo koje knjigovodstvene unose u zatvorenom knjigovodstvenom periodu {0}"
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr "Ne možete kreirati/izmijeniti bilo koje knjigovodstvene unose do ovog datuma."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr "Ne možete kreditirati i debitiratii isti račun u isto vrijeme"
@@ -60887,7 +61030,7 @@ msgstr "Ne možete uređivati nadređeni član."
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr "Ne možete omogućiti i '{0}' i '{1} postavke."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr "Ne možete iskoristiti više od {0}."
@@ -60919,7 +61062,7 @@ msgstr "Nemate dozvole za {} artikala u {}."
msgid "You don't have enough Loyalty Points to redeem"
msgstr "Nemate dovoljno bodova lojalnosti da ih iskoristite"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr "Nemate dovoljno bodova da ih iskoristite."
@@ -61345,7 +61488,7 @@ msgstr "naziv"
msgid "to"
msgstr "do"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr "da poništite iznos ove povratne fakture prije nego što je poništite."
@@ -61385,7 +61528,7 @@ msgstr "{0}"
msgid "{0} '{1}' is disabled"
msgstr "{0} '{1}' je onemogućen"
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr "{0} '{1}' nije u Fiskalnoj Godini {2}"
@@ -61417,7 +61560,7 @@ msgstr "{0} Korišteni kupon je {1}. Dozvoljena količina je iskorištena"
msgid "{0} Digest"
msgstr "{0} Sažetak"
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr "{0} Broj {1} se već koristi u {2} {3}"
@@ -61433,7 +61576,7 @@ msgstr "{0} Zahtjev za {1}"
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr "{0} Zadržani Uzorak se zasniva na Šarži, provjeri Ima Broj Šarže da zadržite uzorak artikla"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr "{0} Transakcije su Usaglašene"
@@ -61449,19 +61592,19 @@ msgstr "{0} račun nije tipa {1}"
msgid "{0} account not found while submitting purchase receipt"
msgstr "{0} račun nije pronađen prilikom podnošenja Kupovnog Računa"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr "{0} naspram Fakture {1} od {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr "{0} naspram Kupovnog Naloga {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr "{0} naspram Prodajne Fakture {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr "{0} naspram Prodajnog Naloga {1}"
@@ -61469,7 +61612,7 @@ msgstr "{0} naspram Prodajnog Naloga {1}"
msgid "{0} already has a Parent Procedure {1}."
msgstr "{0} već ima nadređenu proceduru {1}."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr "{0} i {1}"
@@ -61528,7 +61671,7 @@ msgstr "{0} uneseno dvaput u PDV Artikla"
msgid "{0} entered twice {1} in Item Taxes"
msgstr "{0} uneseno dvaput {1} u PDV Artikla"
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr "{0} za {1}"
@@ -61581,7 +61724,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr "{0} je obavezan za artikal {1}"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr "{0} je obavezan za račun {1}"
@@ -61656,7 +61799,7 @@ msgstr "{0} proizvedenih artikala"
msgid "{0} must be negative in return document"
msgstr "{0} mora biti negativan u povratnom dokumentu"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr "{0} nije dozvoljeno obavljati transakcije sa {1}. Promijeni kompaniju ili dodajte kompaniju u sekciju 'Dozvoljena Transakcija s' u zapisu o klijentima."
@@ -61672,7 +61815,7 @@ msgstr "{0} parametar je nevažeći"
msgid "{0} payment entries can not be filtered by {1}"
msgstr "{0} unose plaćanja ne može filtrirati {1}"
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr "{0} količina artikla {1} se prima u Skladište {2} kapaciteta {3}."
@@ -61733,7 +61876,7 @@ msgstr "{0} {1}"
msgid "{0} {1} Manually"
msgstr "{0} {1} Ručno"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr "{0} {1} Djelimično Usaglašeno"
@@ -61798,7 +61941,7 @@ msgstr "{0} {1} je otkazan ili zaustavljen"
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr "{0} {1} je otkazan tako da se radnja ne može dovršiti"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr "{0} {1} je zatvoren"
@@ -61810,7 +61953,7 @@ msgstr "{0} {1} je onemogućen"
msgid "{0} {1} is frozen"
msgstr "{0} {1} je zamrznut"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr "{0} {1} je u potpunosti fakturisano"
@@ -61822,12 +61965,12 @@ msgstr "{0} {1} nije aktivan"
msgid "{0} {1} is not associated with {2} {3}"
msgstr "{0} {1} nije povezano sa {2} {3}"
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr "{0} {1} nije ni u jednoj aktivnoj Fiskalnoj Godini"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr "{0} {1} nije podnešen"
@@ -61839,7 +61982,7 @@ msgstr "{0} {1} je na čekanju"
msgid "{0} {1} must be submitted"
msgstr "{0} {1} mora se podnijeti"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr "{0} {1} nije dozvoljeno ponovno knjiženje. Izmijeni {2} da omogućite ponovno knjiženje."
@@ -61874,7 +62017,7 @@ msgstr "{0} {1}: Račun {2} je neaktivan"
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr "{0} {1}: Knjigovodstveni Unos za {2} može se izvršiti samo u valuti: {3}"
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr "{0} {1}: Centar Troškova je obavezan za Artikal {2}"
@@ -61952,7 +62095,7 @@ msgstr "{doctype} {name} je otkazan ili zatvoren."
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr "{field_label} je obavezan za podugovoren {doctype}."
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr "{item_name} Veličina Uzorka ({sample_size}) ne može biti veća od Prihvaćene Količina ({accepted_quantity})"
@@ -61960,7 +62103,7 @@ msgstr "{item_name} Veličina Uzorka ({sample_size}) ne može biti veća od Prih
msgid "{ref_doctype} {ref_name} is {status}."
msgstr "{ref_doctype} {ref_name} je {status}."
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr "{}"
@@ -62018,7 +62161,7 @@ msgstr "{} Na Čekanju"
msgid "{} To Bill"
msgstr "{} Za Fakturisati"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr "{} se ne može otkazati jer su zarađeni Poeni Lojalnosti iskorišteni. Prvo otkažite {} Broj {}"
diff --git a/erpnext/locale/cs.po b/erpnext/locale/cs.po
index 08445038c8f..52d80dc049b 100644
--- a/erpnext/locale/cs.po
+++ b/erpnext/locale/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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:09\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:05\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Czech\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr ""
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr ""
msgid "'Default {0} Account' in Company {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr ""
@@ -840,11 +840,11 @@ msgstr ""
msgid "Your Shortcuts"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr ""
@@ -1215,10 +1215,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1523,7 +1523,7 @@ msgstr ""
msgid "Account {0}: You can not assign itself as parent account"
msgstr ""
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr ""
@@ -2012,7 +2012,7 @@ msgstr ""
msgid "Accounts Manager"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr ""
@@ -2199,7 +2199,7 @@ msgstr ""
msgid "Accounts User"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr ""
@@ -2559,6 +2559,10 @@ msgstr ""
msgid "Actual Expense"
msgstr ""
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr ""
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2696,7 +2700,7 @@ msgstr ""
msgid "Add Child"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr ""
@@ -3502,7 +3506,7 @@ msgstr ""
msgid "Advance amount cannot be greater than {0} {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr ""
@@ -3559,7 +3563,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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr ""
@@ -3628,7 +3632,7 @@ msgstr ""
msgid "Against Income Account"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr ""
@@ -3676,7 +3680,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr ""
@@ -3688,7 +3692,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr ""
@@ -3700,8 +3704,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr ""
@@ -3827,7 +3831,7 @@ msgstr ""
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr ""
@@ -3995,7 +3999,7 @@ msgstr ""
msgid "All items have already been Invoiced/Returned"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr ""
@@ -4021,7 +4025,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:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr ""
@@ -4907,7 +4911,7 @@ msgstr ""
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5047,7 +5051,7 @@ msgstr ""
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr ""
@@ -5198,7 +5202,7 @@ msgstr ""
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr ""
@@ -5781,7 +5785,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5823,7 +5827,7 @@ msgstr ""
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr ""
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr ""
@@ -5862,7 +5866,7 @@ msgstr ""
msgid "Asset Finance Book"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr ""
@@ -5938,7 +5942,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr ""
@@ -6024,9 +6028,9 @@ msgstr ""
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr ""
@@ -6055,7 +6059,7 @@ msgstr ""
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr ""
@@ -6087,7 +6091,7 @@ msgstr ""
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr ""
@@ -6099,11 +6103,11 @@ msgstr ""
msgid "Asset returned"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr ""
@@ -6128,7 +6132,7 @@ msgstr ""
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr ""
@@ -6161,7 +6165,15 @@ msgstr ""
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr ""
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr ""
@@ -6542,7 +6554,7 @@ msgstr ""
msgid "Auto Reconcile Payments"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr ""
@@ -6552,7 +6564,7 @@ msgstr ""
msgid "Auto Reconciliation Job Trigger"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr ""
@@ -6727,7 +6739,7 @@ msgstr ""
msgid "Available Batch Report"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr ""
@@ -6956,7 +6968,7 @@ msgstr ""
msgid "BOM 1"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr ""
@@ -7194,23 +7206,23 @@ msgstr ""
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr ""
@@ -7281,7 +7293,7 @@ msgstr ""
msgid "Balance (Dr - Cr)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr ""
@@ -7760,7 +7772,7 @@ msgstr ""
msgid "Base Tax Withholding Net Total"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr ""
@@ -7965,7 +7977,9 @@ msgstr ""
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -7976,7 +7990,7 @@ msgstr ""
msgid "Batch No is mandatory"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr ""
@@ -7999,7 +8013,7 @@ msgstr ""
msgid "Batch Nos"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr ""
@@ -8012,7 +8026,7 @@ msgstr ""
msgid "Batch Number Series"
msgstr ""
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr ""
@@ -8125,7 +8139,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8438,8 +8452,8 @@ msgstr ""
msgid "Blanket Order Rate"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr ""
@@ -8555,7 +8569,7 @@ msgstr ""
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr ""
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr ""
@@ -9329,7 +9343,7 @@ msgstr ""
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr ""
@@ -9515,7 +9529,7 @@ msgstr ""
msgid "Cannot Relieve Employee"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr ""
@@ -9531,6 +9545,10 @@ msgstr ""
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr ""
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr ""
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr ""
@@ -9620,7 +9638,7 @@ msgstr ""
msgid "Cannot create root account."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr ""
@@ -9637,7 +9655,7 @@ msgstr ""
msgid "Cannot delete Exchange Gain/Loss row"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr ""
@@ -10083,11 +10101,11 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr ""
@@ -10100,7 +10118,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr ""
@@ -10908,6 +10926,7 @@ msgstr ""
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11055,6 +11074,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11140,8 +11160,8 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11457,7 +11477,7 @@ msgstr ""
msgid "Company and Posting Date is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr ""
@@ -12738,7 +12758,7 @@ 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12757,7 +12777,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -12970,7 +12990,7 @@ msgstr ""
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr ""
@@ -13093,15 +13113,15 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13343,7 +13363,7 @@ msgstr ""
msgid "Create POS Opening Entry"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr ""
@@ -13499,7 +13519,7 @@ msgstr ""
msgid "Creating Delivery Note ..."
msgstr ""
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr ""
@@ -13519,7 +13539,7 @@ msgstr ""
msgid "Creating Purchase Order ..."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13556,11 +13576,6 @@ msgstr ""
msgid "Creation"
msgstr ""
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr ""
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr ""
@@ -13593,11 +13608,11 @@ msgstr ""
msgid "Credit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr ""
@@ -13740,7 +13755,7 @@ 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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr ""
@@ -13948,7 +13963,7 @@ msgstr ""
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14047,7 +14062,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr ""
@@ -14397,6 +14412,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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14424,6 +14440,10 @@ msgstr ""
msgid "Customer / Lead Address"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr ""
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14825,7 +14845,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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr ""
@@ -15177,7 +15197,7 @@ msgstr ""
msgid "Date of Joining"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr ""
@@ -15314,11 +15334,11 @@ msgstr ""
msgid "Debit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr ""
@@ -15392,7 +15412,7 @@ msgstr ""
msgid "Debit To is required"
msgstr ""
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr ""
@@ -16459,7 +16479,7 @@ msgstr ""
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16534,9 +16554,9 @@ msgstr ""
msgid "Depreciate based on shifts"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr ""
@@ -16592,6 +16612,14 @@ msgstr ""
msgid "Depreciation Entry Posting Status"
msgstr ""
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr ""
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16600,7 +16628,7 @@ msgstr ""
msgid "Depreciation Expense Account"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr ""
@@ -17486,6 +17514,10 @@ msgstr ""
msgid "Discount Percentage"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr ""
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr ""
@@ -17718,7 +17750,7 @@ msgstr ""
msgid "Disposal Date"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr ""
@@ -17998,7 +18030,7 @@ msgstr ""
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr ""
@@ -19037,7 +19069,7 @@ msgstr ""
msgid "Ems(Pica)"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr ""
@@ -19388,7 +19420,7 @@ msgstr ""
msgid "Enter a name for this Holiday List."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr ""
@@ -19449,7 +19481,7 @@ msgstr ""
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr ""
@@ -19469,7 +19501,7 @@ msgid "Entity"
msgstr ""
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19564,7 +19596,7 @@ msgstr ""
msgid "Error in party matching for Bank Transaction {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr ""
@@ -19614,10 +19646,8 @@ msgstr ""
msgid "Evaluation Period"
msgstr ""
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
msgstr ""
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
@@ -19979,7 +20009,7 @@ msgstr ""
msgid "Expense"
msgstr ""
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr ""
@@ -20024,7 +20054,7 @@ msgstr ""
msgid "Expense Account"
msgstr ""
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr ""
@@ -20331,7 +20361,7 @@ msgstr ""
msgid "Failure Description"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr ""
@@ -21007,6 +21037,10 @@ msgstr ""
msgid "Fixed Asset Register"
msgstr ""
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21137,7 +21171,7 @@ msgstr ""
msgid "For Item"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr ""
@@ -22029,7 +22063,7 @@ msgstr ""
msgid "Future Payments"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr ""
@@ -22045,7 +22079,7 @@ msgstr ""
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr ""
@@ -22311,8 +22345,8 @@ msgid "Get Items"
msgstr ""
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22671,7 +22705,7 @@ msgstr ""
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22681,7 +22715,7 @@ msgstr ""
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22802,8 +22836,8 @@ msgstr ""
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr ""
@@ -23154,7 +23188,7 @@ msgstr ""
msgid "Height (cm)"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr ""
@@ -23193,7 +23227,7 @@ msgstr ""
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr ""
@@ -23289,7 +23323,7 @@ msgstr ""
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr ""
@@ -23383,6 +23417,10 @@ msgstr ""
msgid "Hours Spent"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr ""
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23719,6 +23757,10 @@ msgstr ""
msgid "If more than one package of the same type (for print)"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr ""
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23735,6 +23777,10 @@ msgstr ""
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr ""
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23817,6 +23863,10 @@ msgstr ""
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr ""
@@ -23911,7 +23961,7 @@ msgstr ""
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -23963,7 +24013,7 @@ msgstr ""
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr ""
@@ -24726,7 +24776,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24799,7 +24849,7 @@ msgstr ""
msgid "Incorrect Stock Value Report"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr ""
@@ -24966,13 +25016,13 @@ msgstr ""
msgid "Inspected By"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr ""
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr ""
@@ -24989,7 +25039,7 @@ msgstr ""
msgid "Inspection Required before Purchase"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr ""
@@ -25019,7 +25069,7 @@ msgstr ""
msgid "Installation Note Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr ""
@@ -25077,7 +25127,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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr ""
@@ -25268,7 +25318,7 @@ msgstr ""
msgid "Internal Work History"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr ""
@@ -25304,7 +25354,7 @@ msgid "Invalid Account"
msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr ""
@@ -25332,7 +25382,7 @@ msgstr ""
msgid "Invalid Child Procedure"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr ""
@@ -25390,7 +25440,7 @@ msgid "Invalid Ledger Entries"
msgstr ""
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr ""
@@ -25418,7 +25468,7 @@ msgstr ""
msgid "Invalid Priority"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr ""
@@ -25502,8 +25552,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr ""
@@ -25511,7 +25561,7 @@ msgstr ""
msgid "Invalid {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr ""
@@ -25721,7 +25771,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26773,6 +26823,8 @@ msgstr ""
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26791,7 +26843,11 @@ msgstr ""
msgid "Item Code (Final Product)"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr ""
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr ""
@@ -27195,6 +27251,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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28115,7 +28172,7 @@ msgstr ""
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr ""
@@ -28321,7 +28378,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29037,7 +29094,7 @@ msgstr ""
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29708,7 +29765,7 @@ msgstr ""
msgid "Mandatory Depends On"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr ""
@@ -29798,6 +29855,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30356,6 +30414,7 @@ msgid "Material Requested"
msgstr ""
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr ""
@@ -30711,7 +30770,7 @@ msgstr ""
msgid "Message Examples"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr ""
@@ -31025,8 +31084,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr ""
@@ -31044,6 +31103,10 @@ msgstr ""
msgid "Missing Default in Company"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr ""
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr ""
@@ -31076,7 +31139,7 @@ msgstr ""
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr ""
@@ -31742,7 +31805,7 @@ msgstr ""
msgid "Needs Analysis"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr ""
@@ -32174,7 +32237,7 @@ msgstr ""
msgid "New Sales Person Name"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr ""
@@ -32210,7 +32273,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:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr ""
@@ -32319,7 +32382,7 @@ msgstr ""
msgid "No Answer"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr ""
@@ -32376,9 +32439,9 @@ msgstr ""
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr ""
@@ -32413,7 +32476,7 @@ msgstr ""
msgid "No Summary"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr ""
@@ -32511,7 +32574,7 @@ msgstr ""
msgid "No items to be received are overdue"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr ""
@@ -32645,11 +32708,11 @@ msgstr ""
msgid "No values"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr ""
@@ -32684,7 +32747,7 @@ msgstr ""
msgid "Non Profit"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr ""
@@ -32863,7 +32926,7 @@ msgstr ""
msgid "Note: Email will not be sent to disabled users"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr ""
@@ -32883,7 +32946,7 @@ msgstr ""
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr ""
@@ -32899,6 +32962,7 @@ msgstr ""
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33334,6 +33398,12 @@ msgstr ""
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr ""
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr ""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33535,8 +33605,8 @@ msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr ""
@@ -33578,7 +33648,7 @@ msgstr ""
msgid "Opening Entry"
msgstr ""
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr ""
@@ -33606,7 +33676,7 @@ msgid "Opening Invoice Item"
msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 ""
@@ -33680,7 +33750,7 @@ msgstr ""
msgid "Operating Cost Per BOM Quantity"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr ""
@@ -33836,7 +33906,7 @@ msgstr ""
msgid "Operations Routing"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr ""
@@ -34428,7 +34498,7 @@ msgstr ""
msgid "Over Picking Allowance"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr ""
@@ -34880,7 +34950,7 @@ msgstr ""
msgid "Packed Items"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr ""
@@ -34915,7 +34985,7 @@ msgstr ""
msgid "Packing Slip Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr ""
@@ -35001,7 +35071,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35276,7 +35346,7 @@ msgstr ""
msgid "Partial Payment in POS Transactions are not allowed."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr ""
@@ -35470,9 +35540,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35633,9 +35703,9 @@ 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35800,7 +35870,7 @@ msgstr ""
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -35936,7 +36006,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr ""
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr ""
@@ -36145,7 +36215,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36171,11 +36241,11 @@ msgstr ""
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr ""
@@ -36333,7 +36403,7 @@ msgstr ""
msgid "Payment Unlink Error"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr ""
@@ -36654,7 +36724,7 @@ msgstr ""
msgid "Period Based On"
msgstr ""
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr ""
@@ -37257,7 +37327,7 @@ msgstr ""
msgid "Please add {1} role to user {0}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr ""
@@ -37265,7 +37335,7 @@ msgstr ""
msgid "Please attach CSV file"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr ""
@@ -37278,7 +37348,7 @@ msgstr ""
msgid "Please cancel related transaction."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr ""
@@ -37355,7 +37425,7 @@ msgstr ""
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr ""
@@ -37479,7 +37549,7 @@ msgstr ""
msgid "Please enter Receipt Document"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr ""
@@ -37604,8 +37674,8 @@ msgstr ""
msgid "Please mention 'Weight UOM' along with Weight."
msgstr ""
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr ""
@@ -37733,7 +37803,7 @@ msgstr ""
msgid "Please select Posting Date first"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr ""
@@ -37765,7 +37835,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr ""
@@ -37855,6 +37925,10 @@ 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
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr ""
@@ -37863,7 +37937,7 @@ msgstr ""
msgid "Please select atleast one operation to create Job Card"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr ""
@@ -37944,15 +38018,15 @@ msgstr ""
msgid "Please set 'Apply Additional Discount On'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr ""
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr ""
@@ -37960,7 +38034,7 @@ msgstr ""
msgid "Please set Account"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr ""
@@ -37986,7 +38060,7 @@ msgstr ""
msgid "Please set Company"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr ""
@@ -38004,7 +38078,7 @@ msgstr ""
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr ""
@@ -38067,7 +38141,7 @@ msgstr ""
msgid "Please set an Address on the Company '%s'"
msgstr ""
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr ""
@@ -38083,23 +38157,23 @@ msgstr ""
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr ""
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr ""
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr ""
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr ""
@@ -38203,7 +38277,7 @@ msgstr ""
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr ""
@@ -38216,7 +38290,7 @@ msgid "Please specify Company"
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr ""
@@ -38389,6 +38463,7 @@ msgstr ""
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38423,11 +38498,11 @@ 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38446,6 +38521,7 @@ msgstr ""
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38455,6 +38531,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_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
@@ -39020,6 +39097,14 @@ msgstr ""
msgid "Pricing Rule Item Group"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr ""
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr ""
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr ""
@@ -39078,6 +39163,10 @@ msgstr ""
msgid "Pricing Rules"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr ""
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39465,7 +39554,7 @@ msgstr ""
msgid "Process Loss"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr ""
@@ -39955,7 +40044,7 @@ msgstr ""
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40430,7 +40519,7 @@ msgstr ""
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr ""
@@ -40586,7 +40675,7 @@ msgstr ""
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40762,9 +40851,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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41645,6 +41734,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/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
@@ -41761,7 +41851,7 @@ msgstr ""
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr ""
@@ -42610,7 +42700,7 @@ msgid "Reason"
msgstr ""
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr ""
@@ -43046,7 +43136,7 @@ msgstr ""
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr ""
@@ -43178,7 +43268,7 @@ msgstr ""
msgid "Reference"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr ""
@@ -43316,7 +43406,7 @@ msgstr ""
msgid "Reference No"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr ""
@@ -43324,11 +43414,11 @@ msgstr ""
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr ""
@@ -43442,11 +43532,11 @@ msgstr ""
msgid "References"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr ""
@@ -43591,8 +43681,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43611,7 +43701,7 @@ msgstr ""
msgid "Remaining"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr ""
@@ -43624,7 +43714,7 @@ msgstr ""
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr ""
@@ -43673,7 +43763,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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -43984,7 +44074,7 @@ msgstr ""
msgid "Repost Status"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr ""
@@ -44308,7 +44398,7 @@ msgstr ""
msgid "Reseller"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr ""
@@ -44777,7 +44867,7 @@ msgstr ""
msgid "Return / Credit Note"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr ""
@@ -45301,12 +45391,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: 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/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr ""
@@ -45452,7 +45542,7 @@ msgstr ""
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr ""
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr ""
@@ -45476,11 +45566,11 @@ msgstr ""
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr ""
@@ -45500,7 +45590,7 @@ msgstr ""
msgid "Row #{0}: Item {1} does not exist"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr ""
@@ -45536,7 +45626,7 @@ 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:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr ""
@@ -45581,15 +45671,15 @@ msgstr ""
msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr ""
@@ -45598,7 +45688,7 @@ msgstr ""
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr ""
@@ -45692,19 +45782,19 @@ msgstr ""
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr ""
@@ -45712,8 +45802,8 @@ msgstr ""
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr ""
@@ -45894,7 +45984,7 @@ msgstr ""
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr ""
@@ -45902,11 +45992,11 @@ msgstr ""
msgid "Row {0}: Activity Type is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr ""
@@ -45926,7 +46016,7 @@ msgstr ""
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr ""
@@ -45942,7 +46032,7 @@ msgstr ""
msgid "Row {0}: Cost center is required for an item {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr ""
@@ -45950,7 +46040,7 @@ msgstr ""
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr ""
@@ -45966,7 +46056,7 @@ msgstr ""
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr ""
@@ -46000,7 +46090,7 @@ msgstr ""
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46012,7 +46102,7 @@ msgstr ""
msgid "Row {0}: Hours value must be greater than zero."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr ""
@@ -46036,7 +46126,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr ""
@@ -46044,7 +46134,7 @@ msgstr ""
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr ""
@@ -46056,11 +46146,11 @@ msgstr ""
msgid "Row {0}: Payment Term is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr ""
@@ -46128,7 +46218,7 @@ msgstr ""
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46152,7 +46242,7 @@ msgstr ""
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr ""
@@ -46173,7 +46263,7 @@ msgstr ""
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr ""
@@ -46566,7 +46656,7 @@ msgstr ""
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr ""
@@ -46795,7 +46885,7 @@ msgstr ""
msgid "Sales Order Trends"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr ""
@@ -47305,8 +47395,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47577,7 +47667,7 @@ msgstr ""
msgid "Scrap Warehouse"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr ""
@@ -47650,7 +47740,7 @@ msgstr ""
msgid "Section"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr ""
@@ -48020,7 +48110,7 @@ msgstr ""
msgid "Selected POS Opening Entry should be open."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr ""
@@ -48204,7 +48294,7 @@ msgstr ""
msgid "Sender"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr ""
@@ -48328,7 +48418,9 @@ msgstr ""
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48359,7 +48451,9 @@ msgid "Serial No Count"
msgstr ""
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr ""
@@ -48367,7 +48461,7 @@ msgstr ""
msgid "Serial No Range"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr ""
@@ -48407,6 +48501,13 @@ msgstr ""
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr ""
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr ""
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr ""
@@ -48436,7 +48537,7 @@ msgstr ""
msgid "Serial No {0} does not exist"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr ""
@@ -48485,7 +48586,7 @@ msgstr ""
msgid "Serial Nos and Batches"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr ""
@@ -48563,11 +48664,11 @@ msgstr ""
msgid "Serial and Batch Bundle"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr ""
@@ -49001,7 +49102,7 @@ msgstr ""
msgid "Set Loyalty Program"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr ""
@@ -49256,7 +49357,7 @@ msgstr ""
msgid "Setting up company"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49440,7 +49541,7 @@ msgstr ""
msgid "Shipment details"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr ""
@@ -49687,6 +49788,10 @@ msgstr ""
msgid "Show Completed"
msgstr ""
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr ""
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr ""
@@ -49802,7 +49907,7 @@ msgstr ""
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr ""
@@ -50107,13 +50212,27 @@ msgstr ""
msgid "Source DocType"
msgstr ""
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr ""
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr ""
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr ""
@@ -50184,7 +50303,7 @@ msgstr ""
msgid "Source Warehouse Address Link"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr ""
@@ -50695,7 +50814,7 @@ msgstr ""
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51038,7 +51157,7 @@ msgstr ""
msgid "Stock Entry {0} has created"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr ""
@@ -51261,13 +51380,13 @@ msgstr ""
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51276,13 +51395,13 @@ msgstr ""
msgid "Stock Reservation"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr ""
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr ""
@@ -51304,7 +51423,7 @@ msgstr ""
msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr ""
@@ -51549,7 +51668,7 @@ msgstr ""
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr ""
@@ -51565,7 +51684,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr ""
@@ -52433,10 +52552,15 @@ 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr ""
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52549,7 +52673,7 @@ msgstr ""
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr ""
@@ -52563,8 +52687,8 @@ 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr ""
@@ -53111,16 +53235,16 @@ msgstr ""
msgid "System will notify to increase or decrease quantity or amount "
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr ""
@@ -53137,7 +53261,7 @@ msgstr ""
msgid "TDS Payable"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr ""
@@ -53693,7 +53817,7 @@ msgstr ""
msgid "Tax Withheld Vouchers"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr ""
@@ -54318,7 +54442,7 @@ msgstr ""
msgid "The BOM which will be replaced"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr ""
@@ -54346,7 +54470,7 @@ msgstr ""
msgid "The Loyalty Program isn't valid for the selected company"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr ""
@@ -54370,7 +54494,7 @@ msgstr ""
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr ""
@@ -54392,7 +54516,7 @@ msgstr ""
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr ""
@@ -54433,7 +54557,7 @@ msgstr ""
msgid "The field To Shareholder cannot be blank"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr ""
@@ -54449,7 +54573,7 @@ msgstr ""
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr ""
@@ -54710,6 +54834,10 @@ msgstr ""
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr ""
@@ -54976,7 +55104,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr ""
@@ -54984,7 +55112,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr ""
@@ -55759,6 +55887,10 @@ msgstr ""
msgid "To merge, following properties must be same for both items"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr ""
@@ -55776,7 +55908,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr ""
@@ -55998,7 +56130,7 @@ msgstr ""
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56160,7 +56292,7 @@ msgstr ""
msgid "Total Debit"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr ""
@@ -56753,6 +56885,10 @@ msgstr ""
msgid "Traceability"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr ""
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56793,7 +56929,7 @@ msgstr ""
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -56891,7 +57027,7 @@ msgstr ""
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr ""
@@ -56913,7 +57049,7 @@ msgstr ""
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57510,7 +57646,11 @@ msgstr ""
msgid "Unassigned Qty"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr ""
@@ -58877,7 +59017,7 @@ msgstr ""
msgid "Vendor Invoices"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr ""
@@ -58944,7 +59084,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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59135,11 +59275,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59174,7 +59314,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr ""
@@ -59206,9 +59346,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59227,6 +59367,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_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
@@ -59436,6 +59577,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_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
@@ -59544,7 +59686,7 @@ msgstr ""
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr ""
@@ -59557,7 +59699,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:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr ""
@@ -59708,7 +59850,7 @@ msgstr ""
msgid "Warning!"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr ""
@@ -60191,6 +60333,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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr ""
@@ -60666,7 +60809,7 @@ msgstr ""
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr ""
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr ""
@@ -60698,7 +60841,7 @@ msgstr ""
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr ""
@@ -60715,7 +60858,7 @@ msgstr ""
msgid "You can only select one mode of payment as default"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr ""
@@ -60747,11 +60890,11 @@ msgstr ""
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr ""
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr ""
@@ -60767,7 +60910,7 @@ msgstr ""
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr ""
@@ -60799,7 +60942,7 @@ msgstr ""
msgid "You don't have enough Loyalty Points to redeem"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr ""
@@ -61225,7 +61368,7 @@ msgstr ""
msgid "to"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr ""
@@ -61265,7 +61408,7 @@ msgstr ""
msgid "{0} '{1}' is disabled"
msgstr ""
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr ""
@@ -61297,7 +61440,7 @@ msgstr ""
msgid "{0} Digest"
msgstr ""
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr ""
@@ -61313,7 +61456,7 @@ msgstr ""
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr ""
@@ -61329,19 +61472,19 @@ msgstr ""
msgid "{0} account not found while submitting purchase receipt"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr ""
@@ -61349,7 +61492,7 @@ msgstr ""
msgid "{0} already has a Parent Procedure {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr ""
@@ -61408,7 +61551,7 @@ msgstr ""
msgid "{0} entered twice {1} in Item Taxes"
msgstr ""
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr ""
@@ -61461,7 +61604,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr ""
@@ -61536,7 +61679,7 @@ msgstr ""
msgid "{0} must be negative in return document"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr ""
@@ -61552,7 +61695,7 @@ msgstr ""
msgid "{0} payment entries can not be filtered by {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr ""
@@ -61613,7 +61756,7 @@ msgstr ""
msgid "{0} {1} Manually"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr ""
@@ -61678,7 +61821,7 @@ msgstr ""
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr ""
@@ -61690,7 +61833,7 @@ msgstr ""
msgid "{0} {1} is frozen"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr ""
@@ -61702,12 +61845,12 @@ msgstr ""
msgid "{0} {1} is not associated with {2} {3}"
msgstr ""
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr ""
@@ -61719,7 +61862,7 @@ msgstr ""
msgid "{0} {1} must be submitted"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr ""
@@ -61754,7 +61897,7 @@ msgstr ""
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr ""
@@ -61832,7 +61975,7 @@ msgstr ""
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr ""
@@ -61840,7 +61983,7 @@ msgstr ""
msgid "{ref_doctype} {ref_name} is {status}."
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr ""
@@ -61898,7 +62041,7 @@ msgstr ""
msgid "{} To Bill"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr ""
diff --git a/erpnext/locale/de.po b/erpnext/locale/de.po
index fe1ce768fcd..8689532bed4 100644
--- a/erpnext/locale/de.po
+++ b/erpnext/locale/de.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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:09\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:05\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr " Artikel"
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr "„Tage seit der letzten Bestellung“ muss größer oder gleich null se
msgid "'Default {0} Account' in Company {1}"
msgstr "'Standardkonto {0} ' in Unternehmen {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr "\"Buchungen\" kann nicht leer sein"
@@ -919,11 +919,11 @@ msgstr "Ihre Verknüpfungen\n"
msgid "Your Shortcuts"
msgstr "Ihre Verknüpfungen"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr "Gesamtsumme:{0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr "Ausstehender Betrag: {0}"
@@ -1319,10 +1319,10 @@ msgstr "Laut Stückliste {0} fehlt in der Lagerbuchung die Position '{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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1627,7 +1627,7 @@ msgstr "Konto {0}: Hauptkonto {1} existiert nicht"
msgid "Account {0}: You can not assign itself as parent account"
msgstr "Konto {0}: Sie können dieses Konto sich selbst nicht als Über-Konto zuweisen"
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr "Konto: {0} ist in Bearbeitung und kann vom Buchungssatz nicht aktualisiert werden"
@@ -2116,7 +2116,7 @@ msgstr "Konten bis zum Datum eingefroren"
msgid "Accounts Manager"
msgstr "Kontenmanager"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr "Fehler „Konten fehlen“"
@@ -2303,7 +2303,7 @@ msgstr "Buchhaltungseinstellungen"
msgid "Accounts User"
msgstr "Rechnungswesen Benutzer"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr "Kontenliste darf nicht leer sein."
@@ -2663,6 +2663,10 @@ msgstr "Ist-Endzeit"
msgid "Actual Expense"
msgstr "Ist-Ausgaben"
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr ""
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2800,7 +2804,7 @@ msgstr "Preise hinzufügen / bearbeiten"
msgid "Add Child"
msgstr "Unterpunkt hinzufügen"
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr "Spalten in Transaktionswährung hinzufügen"
@@ -3606,7 +3610,7 @@ msgstr "Anzahlungsbetrag"
msgid "Advance amount cannot be greater than {0} {1}"
msgstr "Anzahlung kann nicht größer sein als {0} {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr "Der auf {0} {1} gezahlte Vorschuss kann nicht höher sein als die Gesamtsumme {2}"
@@ -3663,7 +3667,7 @@ msgstr "Zu"
#: 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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr "Gegenkonto"
@@ -3732,7 +3736,7 @@ msgstr "Zu Aufwandskonto"
msgid "Against Income Account"
msgstr "Zu Ertragskonto"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr "Buchungssatz {0} hat keinen offenen Eintrag auf der {1}-Seite"
@@ -3780,7 +3784,7 @@ msgstr "Gegen Lieferantenrechnung {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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr "Gegenbeleg"
@@ -3792,7 +3796,7 @@ msgstr "Gegenbeleg"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr "Belegnr."
@@ -3804,8 +3808,8 @@ msgstr "Belegnr."
#: 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr "Gegen Belegart"
@@ -3931,7 +3935,7 @@ msgstr "Alle"
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr "Alle Konten"
@@ -4099,7 +4103,7 @@ msgstr "Alle Artikel sind bereits angefordert"
msgid "All items have already been Invoiced/Returned"
msgstr "Alle Artikel wurden bereits in Rechnung gestellt / zurückgesandt"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr "Alle Artikel sind bereits eingegangen"
@@ -4125,7 +4129,7 @@ msgstr "Alle Artikel wurden bereits zurückgegeben."
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 "Alle benötigten Artikel (Rohmaterial) werden aus der Stückliste geholt und in diese Tabelle eingetragen. Hier können Sie auch das Quelllager für jeden Artikel ändern. Und während der Produktion können Sie das übertragene Rohmaterial in dieser Tabelle verfolgen."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr "Alle diese Artikel wurden bereits in Rechnung gestellt / zurückgesandt"
@@ -5011,7 +5015,7 @@ msgstr "Berichtigung von"
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5151,7 +5155,7 @@ msgstr "Betrag als Zahl"
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr "Betrag in Kontowährung"
@@ -5302,7 +5306,7 @@ msgstr "Ein weiterer Budgeteintrag '{0}' existiert bereits für {1} '
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr "Ein weiterer Datensatz der Kostenstellen-Zuordnung {0} gilt ab {1}, daher gilt diese Zuordnung bis {2}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr "Eine andere Zahlungsaufforderung wird bereits bearbeitet"
@@ -5885,7 +5889,7 @@ msgstr "Lagerartikel für Vermögensgegenstand-Aktivierung"
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5927,7 +5931,7 @@ msgstr "Zeitplan für die Abschreibung von Vermögensgegenständen"
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr "Zeitplan zur Abschreibung von Vermögensgegenstand {0} und Finanzbuch {1} verwendet keine schichtbasierte Abschreibung"
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr "Vermögensgegenstand Abschreibungsplan nicht gefunden für Vermögensgegenstand {0} und Finanzbuch {1}"
@@ -5966,7 +5970,7 @@ msgstr ""
msgid "Asset Finance Book"
msgstr "Anlagenfinanzierungsbuch"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr "Vermögensgegenstand ID"
@@ -6042,7 +6046,7 @@ msgstr "Vermögensgegenstand-Bewegung {0} erstellt"
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr "Name Vermögenswert"
@@ -6128,9 +6132,9 @@ msgstr "Status Vermögenswert"
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr "Vermögensgegenstand Wert"
@@ -6159,7 +6163,7 @@ msgstr "Vermögensgegenstand storniert"
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "Vermögenswert kann nicht rückgängig gemacht werden, da es ohnehin schon {0} ist"
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr "Der Vermögensgegenstand kann nicht vor der letzten Abschreibungsbuchung verschrottet werden."
@@ -6191,7 +6195,7 @@ msgstr "Vermögensgegenstand außer Betrieb aufgrund von Reparatur {0}"
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr "Vermögensgegenstand erhalten am Standort {0} und ausgegeben an Mitarbeiter {1}"
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr "Vermögensgegenstand wiederhergestellt"
@@ -6203,11 +6207,11 @@ msgstr "Vermögensgegenstand wiederhergestellt, nachdem die Vermögensgegenstand
msgid "Asset returned"
msgstr "Vermögensgegenstand zurückgegeben"
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr "Vermögensgegenstand verschrottet"
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr "Vermögensgegenstand verschrottet über Buchungssatz {0}"
@@ -6232,7 +6236,7 @@ msgstr "Vermögensgegenstand nach der Abspaltung in Vermögensgegenstand {0} akt
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr "Vermögensgegenstand {0} kann nicht verschrottet werden, da er bereits {1} ist"
@@ -6265,7 +6269,15 @@ msgstr "Vermögensgegenstand {0} wurde aktualisiert. Bitte geben Sie die Abschre
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr ""
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr "Vermögensgegenstand {0} muss gebucht werden"
@@ -6646,7 +6658,7 @@ msgstr "Automatisch abgleichen"
msgid "Auto Reconcile Payments"
msgstr "Zahlungen automatisch abgleichen"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr "Automatischer Abgleich"
@@ -6656,7 +6668,7 @@ msgstr "Automatischer Abgleich"
msgid "Auto Reconciliation Job Trigger"
msgstr "Auslöser für automatischen Abgleichsjob"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr "Der automatische Abgleich wurde im Hintergrund gestartet"
@@ -6831,7 +6843,7 @@ msgstr "Verfügbare Losgröße im Lager"
msgid "Available Batch Report"
msgstr "Verfügbare Chargen"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr "Zeitpunkt der Einsatzbereitschaft"
@@ -7060,7 +7072,7 @@ msgstr "Stückliste"
msgid "BOM 1"
msgstr "Stückliste 1"
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "Stückliste 1 {0} und Stückliste 2 {1} sollten nicht identisch sein"
@@ -7298,23 +7310,23 @@ msgstr "Stückliste enthält keine Lagerware"
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr "Stücklistenrekursion: {0} darf nicht untergeordnet zu {1} sein"
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr "Stücklistenrekursion: {1} kann nicht über- oder untergeordnet von {0} sein"
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr "Stückliste {0} gehört nicht zum Artikel {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr "Stückliste {0} muss aktiv sein"
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr "Stückliste {0} muss gebucht werden"
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr "Stückliste {0} für den Artikel {1} nicht gefunden"
@@ -7385,7 +7397,7 @@ msgstr "Saldo"
msgid "Balance (Dr - Cr)"
msgstr "Saldo (S - H)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr "Saldo ({0})"
@@ -7864,7 +7876,7 @@ msgstr "Basispreis"
msgid "Base Tax Withholding Net Total"
msgstr "Basis-Steuereinbehalt-Nettosumme"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr "Basis-Summe"
@@ -8069,7 +8081,9 @@ msgstr "Stapelobjekt Ablauf-Status"
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -8080,7 +8094,7 @@ msgstr "Chargennummer"
msgid "Batch No is mandatory"
msgstr "Chargennummer ist obligatorisch"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr "Charge Nr. {0} existiert nicht"
@@ -8103,7 +8117,7 @@ msgstr "Chargennummer."
msgid "Batch Nos"
msgstr "Chargennummern"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr "Chargennummern wurden erfolgreich erstellt"
@@ -8116,7 +8130,7 @@ msgstr "Charge nicht zur Rückgabe verfügbar"
msgid "Batch Number Series"
msgstr "Nummernkreis für Chargen"
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr "Chargenmenge"
@@ -8229,7 +8243,7 @@ msgstr "Rechnung für abgelehnte Menge in der Eingangsrechnung"
#. Label of a Card Break in the Manufacturing Workspace
#. Label of a Link in the Manufacturing Workspace
-#: erpnext/manufacturing/doctype/bom/bom.py:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8542,8 +8556,8 @@ msgstr "Rahmenauftragsposition"
msgid "Blanket Order Rate"
msgstr "Rahmenauftrag Preis"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr "Rechnung sperren"
@@ -8659,7 +8673,7 @@ msgstr "Gebuchtes Anlagevermögen"
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr "Das Verbuchen von Lagerbeständen auf mehreren Konten erschwert die Nachverfolgung von Lagerbeständen und Kontowerten."
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr "Die Bücher wurden bis zu dem am {0} endenden Zeitraum geschlossen"
@@ -9433,7 +9447,7 @@ msgstr "Kann nicht nach Zahlungsmethode filtern, wenn nach Zahlungsmethode grupp
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr "Kann nicht nach Belegnummer filtern, wenn nach Beleg gruppiert"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr "Zahlung kann nur zu einem noch nicht abgerechneten Beleg vom Typ {0} erstellt werden"
@@ -9619,7 +9633,7 @@ msgstr "Route kann nicht optimiert werden, da die Fahreradresse fehlt."
msgid "Cannot Relieve Employee"
msgstr "Mitarbeiter kann nicht entlastet werden"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr "Erneutes Buchen von Belegen in einem abgeschlossenem Wirtschaftsjahr ist nicht möglich."
@@ -9635,6 +9649,10 @@ msgstr "Quellensteuer (TDS) kann nicht auf mehrere Parteien in einer Buchung ang
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr "Kann keine Anlageposition sein, wenn das Stock Ledger erstellt wird."
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr ""
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr ""
@@ -9724,7 +9742,7 @@ msgstr ""
msgid "Cannot create root account."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr "Stückliste kann nicht deaktiviert oder storniert werden, weil sie mit anderen Stücklisten verknüpft ist"
@@ -9741,7 +9759,7 @@ msgstr "Abzug nicht möglich, wenn Kategorie \"Wertbestimmtung\" oder \"Wertbest
msgid "Cannot delete Exchange Gain/Loss row"
msgstr "Zeile „Wechselkursgewinn/-verlust“ kann nicht gelöscht werden"
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr "Die Seriennummer {0} kann nicht gelöscht werden, da sie in Lagertransaktionen verwendet wird"
@@ -10187,11 +10205,11 @@ msgstr "Kette"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr "Rückgeld"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr "Ändern Sie das Veröffentlichungsdatum"
@@ -10204,7 +10222,7 @@ msgstr "Ändern Sie das Veröffentlichungsdatum"
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr "Änderung des Lagerwerts"
@@ -11012,6 +11030,7 @@ msgstr "Firmen"
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11159,6 +11178,7 @@ msgstr "Firmen"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11244,8 +11264,8 @@ msgstr "Firmen"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11561,7 +11581,7 @@ msgstr "Eigene Steuernummer"
msgid "Company and Posting Date is mandatory"
msgstr "Unternehmen und Buchungsdatum sind obligatorisch"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr "Firmenwährungen beider Unternehmen sollten für Inter Company-Transaktionen übereinstimmen."
@@ -12842,7 +12862,7 @@ msgstr "Kosten"
#: 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12861,7 +12881,7 @@ msgstr "Kosten"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -13074,7 +13094,7 @@ msgstr "Demodaten konnten nicht gelöscht werden"
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr "Der Kunde konnte aufgrund der folgenden fehlenden Pflichtfelder nicht automatisch erstellt werden:"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr "Gutschrift konnte nicht automatisch erstellt werden, bitte deaktivieren Sie 'Gutschrift ausgeben' und senden Sie sie erneut"
@@ -13197,15 +13217,15 @@ msgstr "H"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13447,7 +13467,7 @@ msgstr "Chance erstellen"
msgid "Create POS Opening Entry"
msgstr "POS-Eröffnungseintrag erstellen"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr "Zahlungseintrag erstellen"
@@ -13603,7 +13623,7 @@ msgstr "Konten erstellen ..."
msgid "Creating Delivery Note ..."
msgstr "Lieferschein erstellen ..."
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr "Dimensionen erstellen ..."
@@ -13623,7 +13643,7 @@ msgstr "Eingangsrechnungen erstellen ..."
msgid "Creating Purchase Order ..."
msgstr "Bestellung anlegen ..."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13660,11 +13680,6 @@ msgstr "{} Aus {} {} erstellen"
msgid "Creation"
msgstr "Erstellung"
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr "Belegerstellungs-Nr."
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr "Erstellung erfolgreich: {1}"
@@ -13699,11 +13714,11 @@ msgstr "Erstellung von {0} teilweise erfolgreich.\n"
msgid "Credit"
msgstr "Haben"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr "Haben (Transaktion)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr "Guthaben ({0})"
@@ -13846,7 +13861,7 @@ msgstr "Gutschrift ausgestellt"
msgid "Credit Note will update it's own outstanding amount, even if 'Return Against' is specified."
msgstr "Den ausstehenden Betrag dieser Rechnungskorrektur separat buchen, statt den der korrigierten Rechnung zu verringern."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr "Gutschrift {0} wurde automatisch erstellt"
@@ -14054,7 +14069,7 @@ msgstr "Tasse"
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14153,7 +14168,7 @@ msgstr "Die Währung kann nicht geändert werden, wenn Buchungen in einer andere
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr "Währung für {0} muss {1} sein"
@@ -14503,6 +14518,7 @@ msgstr "Benutzerdefiniert?"
#: 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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14530,6 +14546,10 @@ msgstr "Kunde / Artikel / Artikelgruppe"
msgid "Customer / Lead Address"
msgstr "Kunden- / Interessenten-Adresse"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr ""
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14931,7 +14951,7 @@ msgstr "Kunde erforderlich für \"Kundenbezogener 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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr "Customer {0} gehört nicht zum Projekt {1}"
@@ -15283,7 +15303,7 @@ msgstr "Ausstellungsdatum"
msgid "Date of Joining"
msgstr "Eintrittsdatum"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr "Datum der Transaktion"
@@ -15420,11 +15440,11 @@ msgstr "Sehr geehrter System Manager,"
msgid "Debit"
msgstr "Soll"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr "Soll (Transaktion)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr "Soll ({0})"
@@ -15498,7 +15518,7 @@ msgstr "Forderungskonto"
msgid "Debit To is required"
msgstr "Forderungskonto erforderlich"
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr "Soll und Haben nicht gleich für {0} #{1}. Unterschied ist {2}."
@@ -16565,7 +16585,7 @@ msgstr "Demodaten gelöscht"
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16640,9 +16660,9 @@ msgstr "Abschreibung auf Basis der täglichen Pro-rata"
msgid "Depreciate based on shifts"
msgstr "Abschreibung auf Basis von Schichten"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr "Abschreibungsbetrag"
@@ -16698,6 +16718,14 @@ msgstr "Abschreibungs Eintrag"
msgid "Depreciation Entry Posting Status"
msgstr "Buchungsstatus des Abschreibungseintrags"
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr ""
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16706,7 +16734,7 @@ msgstr "Buchungsstatus des Abschreibungseintrags"
msgid "Depreciation Expense Account"
msgstr "Konto für Abschreibungsaufwand"
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr "Das Abschreibungsaufwandskonto sollte ein Erlös- oder Aufwandskonto sein."
@@ -17592,6 +17620,10 @@ msgstr "Rabattdatum"
msgid "Discount Percentage"
msgstr "Rabatt in Prozent"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr ""
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr ""
@@ -17824,7 +17856,7 @@ msgstr "Versandeinstellungen"
msgid "Disposal Date"
msgstr "Verkauf Datum"
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr ""
@@ -18104,7 +18136,7 @@ msgstr "Dokumente"
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr "Bei jedem Trigger verarbeitete Dokumente. Die Größe der Warteschlange sollte zwischen 5 und 100 liegen."
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr "Dokumente: {0} hat aktive und passive Rechnungsabgrenzung aktiviert. Kann nicht erneut umbuchen."
@@ -19143,7 +19175,7 @@ msgstr "Leer"
msgid "Ems(Pica)"
msgstr "Ems (Pica)"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr "Aktivieren Sie „Teilreservierung zulassen“ in den Lagereinstellungen, um einen Teilbestand zu reservieren."
@@ -19494,7 +19526,7 @@ msgstr "Geben Sie einen Namen für den Vorgang ein, zum Beispiel „Schneiden“
msgid "Enter a name for this Holiday List."
msgstr "Geben Sie einen Namen für diese Liste der arbeitsfreien Tage ein."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr "Geben Sie den einzulösenden Betrag ein."
@@ -19556,7 +19588,7 @@ msgstr "Geben Sie die Menge des Artikels ein, der aus dieser Stückliste hergest
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr "Geben Sie die zu produzierende Menge ein. Rohmaterialartikel werden erst abgerufen, wenn dies eingetragen ist."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr "Geben Sie den Betrag {0} ein."
@@ -19576,7 +19608,7 @@ msgid "Entity"
msgstr "Entität"
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19671,7 +19703,7 @@ msgstr "Fehler bei der Auswertung der Kriterienformel"
msgid "Error in party matching for Bank Transaction {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr "Fehler beim Buchen von Abschreibungsbuchungen"
@@ -19723,11 +19755,9 @@ msgstr "Geschätzte Zeit und Kosten"
msgid "Evaluation Period"
msgstr "Bewertungszeitraum"
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
-msgstr "Auch Rechnungen, bei denen die Option „Steuereinbehalt anwenden“ nicht aktiviert ist, werden bei der Überprüfung der kumulativen Schwellenwertüberschreitung berücksichtigt"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
+msgstr ""
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
@@ -20089,7 +20119,7 @@ msgstr "Erwartungswert nach der Ausmusterung"
msgid "Expense"
msgstr "Aufwand"
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr "Aufwands-/Differenz-Konto ({0}) muss ein \"Gewinn oder Verlust\"-Konto sein"
@@ -20134,7 +20164,7 @@ msgstr "Aufwands-/Differenz-Konto ({0}) muss ein \"Gewinn oder Verlust\"-Konto s
msgid "Expense Account"
msgstr "Aufwandskonto"
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr "Spesenabrechnung fehlt"
@@ -20441,7 +20471,7 @@ msgstr "Fehlerdatum"
msgid "Failure Description"
msgstr "Fehlerbeschreibung"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr "Fehler: {0}"
@@ -21117,6 +21147,10 @@ msgstr "Posten des Anlagevermögens muss ein Artikel ohne Lagerhaltung sein."
msgid "Fixed Asset Register"
msgstr "Verzeichnis der Vermögensgegenstände"
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21247,7 +21281,7 @@ msgstr "Für Standardlieferanten (optional)"
msgid "For Item"
msgstr "Für Artikel"
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr "Für Artikel {0} können nicht mehr als {1} ME gegen {2} {3} in Empfang genommen werden"
@@ -22139,7 +22173,7 @@ msgstr "Zukünftige Zahlung"
msgid "Future Payments"
msgstr "Zukünftige Zahlungen"
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr "Ein zukünftiges Datum ist nicht zulässig"
@@ -22155,7 +22189,7 @@ msgstr "Hauptbuchsaldo"
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr "Buchung zum Hauptbuch"
@@ -22421,8 +22455,8 @@ msgid "Get Items"
msgstr "Artikel aufrufen"
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22781,7 +22815,7 @@ msgstr "Gramm/Liter"
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22791,7 +22825,7 @@ msgstr "Gramm/Liter"
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22912,8 +22946,8 @@ msgstr "Bruttogewinn in Prozent"
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr "Bruttokaufbetrag"
@@ -23264,7 +23298,7 @@ msgstr "Hectopascal"
msgid "Height (cm)"
msgstr "Höhe (cm)"
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr "Hallo,"
@@ -23303,7 +23337,7 @@ msgstr "Hilfe Text"
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr "Hilft Ihnen, das Budget/Ziel über die Monate zu verteilen, wenn Sie in Ihrem Geschäft saisonale Schwankungen haben."
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr "Hier sind die Fehlerprotokolle für die oben erwähnten fehlgeschlagenen Abschreibungseinträge: {0}"
@@ -23399,7 +23433,7 @@ msgstr "Anhalten"
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr "Rechnung zurückhalten"
@@ -23493,6 +23527,10 @@ msgstr "Stunden"
msgid "Hours Spent"
msgstr "Geleistete Stunden"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr ""
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23831,6 +23869,10 @@ msgstr "Falls gesetzt, erlaubt das System nur Benutzern mit dieser Rolle, eine B
msgid "If more than one package of the same type (for print)"
msgstr "Wenn es mehr als ein Paket von der gleichen Art (für den Druck) gibt"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr ""
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23847,6 +23889,10 @@ msgstr "Wenn nicht, können Sie diesen Eintrag stornieren / buchen"
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr "Wenn der Preis Null ist, wird der Artikel als „Kostenloser Artikel“ behandelt"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr ""
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23929,6 +23975,10 @@ msgstr "Wenn dieses Kontrollkästchen aktiviert ist, können mehrere Materialien
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr "Wenn dieses Kontrollkästchen aktiviert ist, werden die Stücklistenkosten automatisch basierend auf dem Bewertungssatz / Preislistenpreis / der letzten Einkaufsrate der Rohstoffe aktualisiert."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr "Wenn die Gültigkeit der Treuepunkte unbegrenzt ist, lassen Sie die Ablaufdauer leer oder auf 0."
@@ -24023,7 +24073,7 @@ msgstr "Leeren Bestand ignorieren"
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -24075,7 +24125,7 @@ msgstr "„Preisregel ignorieren“ ist aktiviert. Gutscheincode kann nicht ange
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr ""
@@ -24838,7 +24888,7 @@ msgstr "Einstellungen für eingehende Anrufe"
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24911,7 +24961,7 @@ msgstr "Ungültiges Serien- und Chargenbündel"
msgid "Incorrect Stock Value Report"
msgstr "Falscher Lagerwertbericht"
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr "Falsche Transaktionsart"
@@ -25078,13 +25128,13 @@ msgstr "Neue Datensätze einfügen"
msgid "Inspected By"
msgstr "kontrolliert durch"
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr "Inspektion abgelehnt"
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr "Prüfung erforderlich"
@@ -25101,7 +25151,7 @@ msgstr "Inspektion vor der Auslieferung erforderlich"
msgid "Inspection Required before Purchase"
msgstr "Inspektion vor dem Kauf erforderlich"
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr ""
@@ -25131,7 +25181,7 @@ msgstr "Installationshinweis"
msgid "Installation Note Item"
msgstr "Bestandteil des Installationshinweises"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr "Der Installationsschein {0} wurde bereits gebucht"
@@ -25189,7 +25239,7 @@ msgstr "Nicht ausreichende Berechtigungen"
#: 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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "Nicht genug Lagermenge."
@@ -25380,7 +25430,7 @@ msgstr "Interne Transfers"
msgid "Internal Work History"
msgstr "Interne Arbeits-Historie"
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr "Interne Transfers können nur in der Standardwährung des Unternehmens durchgeführt werden"
@@ -25416,7 +25466,7 @@ msgid "Invalid Account"
msgstr "Ungültiger Account"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr "Ungültiger zugewiesener Betrag"
@@ -25444,7 +25494,7 @@ msgstr "Ungültiger Rahmenauftrag für den ausgewählten Kunden und Artikel"
msgid "Invalid Child Procedure"
msgstr "Ungültige untergeordnete Prozedur"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr "Ungültige Firma für Inter Company-Transaktion."
@@ -25502,7 +25552,7 @@ msgid "Invalid Ledger Entries"
msgstr "Ungültige Hauptbucheinträge"
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr "Ungültiger Eröffnungseintrag"
@@ -25530,7 +25580,7 @@ msgstr "Ungültige primäre Rolle"
msgid "Invalid Priority"
msgstr "Ungültige Priorität"
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr "Ungültige Prozessverlust-Konfiguration"
@@ -25614,8 +25664,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr "Ungültiger Wert {0} für {1} gegen Konto {2}"
@@ -25623,7 +25673,7 @@ msgstr "Ungültiger Wert {0} für {1} gegen Konto {2}"
msgid "Invalid {0}"
msgstr "Ungültige(r) {0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr "Ungültige {0} für Inter Company-Transaktion."
@@ -25833,7 +25883,7 @@ msgstr "In Rechnung gestellte Menge"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26885,6 +26935,8 @@ msgstr "Artikel-Warenkorb"
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26903,7 +26955,11 @@ msgstr "Artikel-Code"
msgid "Item Code (Final Product)"
msgstr "Artikelcode (Endprodukt)"
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr ""
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr "Artikelnummer kann nicht für Seriennummer geändert werden"
@@ -27307,6 +27363,7 @@ msgstr "Artikel Hersteller"
#: 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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28227,7 +28284,7 @@ msgstr "Buchungssatz für Ausschuss"
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr "Buchungssatz-Typ muss als Abschreibungseintrag für die Abschreibung von Vermögensgegenständen eingestellt werden"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr "Buchungssatz {0} gehört nicht zu Konto {1} oder ist bereits mit einem anderen Beleg abgeglichen"
@@ -28433,7 +28490,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29150,7 +29207,7 @@ msgstr "Lokal"
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29821,7 +29878,7 @@ msgstr "Obligatorische Buchhaltungsdimension"
msgid "Mandatory Depends On"
msgstr "Bedingung für Pflichtfeld"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr "Pflichtfeld"
@@ -29911,6 +29968,7 @@ msgstr "Manuelle Eingabe kann nicht erstellt werden! Deaktivieren Sie die automa
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30469,6 +30527,7 @@ msgid "Material Requested"
msgstr "Material angefordert"
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr "Materialanfragen"
@@ -30824,7 +30883,7 @@ msgstr "Nachricht"
msgid "Message Examples"
msgstr "Mitteilungsbeispiele"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr "Mitteilung gesendet"
@@ -31138,8 +31197,8 @@ msgstr "Fehlt"
#: 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr "Fehlendes Konto"
@@ -31157,6 +31216,10 @@ msgstr "Fehlende Kostenstelle"
msgid "Missing Default in Company"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr ""
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr "Fehlendes Finanzbuch"
@@ -31189,7 +31252,7 @@ msgstr "Angaben zu fehlenden Werten erforderlich"
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr "Fehlende E-Mail-Vorlage für den Versand. Bitte legen Sie einen in den Liefereinstellungen fest."
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr "Fehlender Wert"
@@ -31855,7 +31918,7 @@ msgstr "Erdgas"
msgid "Needs Analysis"
msgstr "Muss analysiert werden"
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr "Negative Chargenmenge"
@@ -32287,7 +32350,7 @@ msgstr "Neue Aufträge"
msgid "New Sales Person Name"
msgstr "Neuer Verkaufspersonenname"
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr "\"Neue Seriennummer\" kann keine Lagerangabe enthalten. Lagerangaben müssen durch eine Lagerbuchung oder einen Eingangsbeleg erstellt werden"
@@ -32323,7 +32386,7 @@ msgstr "Neues Geschäftsjahr erstellt: - "
msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date"
msgstr "Neue Rechnungen werden planmäßig erstellt, auch wenn aktuelle Rechnungen nicht bezahlt wurden oder überfällig sind"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr "Das neue Erscheinungsdatum sollte in der Zukunft liegen"
@@ -32432,7 +32495,7 @@ msgstr "Keine Aktion"
msgid "No Answer"
msgstr "Keine Antwort"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr "Für Transaktionen zwischen Unternehmen, die das Unternehmen {0} darstellen, wurde kein Kunde gefunden."
@@ -32489,9 +32552,9 @@ msgstr "Für diese Partei wurden keine ausstehenden Rechnungen gefunden"
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr "Kein POS-Profil gefunden. Bitte erstellen Sie zunächst ein neues POS-Profil"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr "Keine Berechtigung"
@@ -32526,7 +32589,7 @@ msgstr "Derzeit kein Lagerbestand verfügbar"
msgid "No Summary"
msgstr "Keine Zusammenfassung"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr "Es wurde kein Lieferant für Transaktionen zwischen Unternehmen gefunden, die das Unternehmen {0} darstellen."
@@ -32624,7 +32687,7 @@ msgstr "Keine Artikel im Warenkorb"
msgid "No items to be received are overdue"
msgstr "Keine zu übergebenden Artikel sind überfällig"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr "Keine Treffer beim automatischen Abgleich"
@@ -32758,11 +32821,11 @@ msgstr "Vor diesem Datum können keine Lagervorgänge erstellt oder geändert we
msgid "No values"
msgstr "Keine Werte"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr "Keine {0} Konten für dieses Unternehmen gefunden."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr "Keine {0} für Inter-Company-Transaktionen gefunden."
@@ -32797,7 +32860,7 @@ msgstr ""
msgid "Non Profit"
msgstr "Gemeinnützig"
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr "Artikel ohne Lagerhaltung"
@@ -32976,7 +33039,7 @@ msgstr ""
msgid "Note: Email will not be sent to disabled users"
msgstr "Hinweis: E-Mail wird nicht an gesperrte Nutzer gesendet"
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr ""
@@ -32996,7 +33059,7 @@ msgstr "Hinweis: Diese Kostenstelle ist eine Gruppe. Buchungen können nicht zu
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr "Hinweis: Um die Artikel zusammenzuführen, erstellen Sie eine separate Bestandsabstimmung für den alten Artikel {0}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr "Hinweis: {0}"
@@ -33012,6 +33075,7 @@ msgstr "Hinweis: {0}"
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33447,6 +33511,12 @@ msgstr "In dieser Transaktion sind nur Unterknoten erlaubt"
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr "Nur ein {0} Eintrag kann gegen den Arbeitsauftrag {1} erstellt werden"
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr ""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33649,8 +33719,8 @@ msgstr "Anfangsstand (Soll)"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr ""
@@ -33692,7 +33762,7 @@ msgstr "Eröffnungsdatum"
msgid "Opening Entry"
msgstr "Eröffnungsbuchung"
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr ""
@@ -33720,7 +33790,7 @@ msgid "Opening Invoice Item"
msgstr "Rechnungsposition öffnen"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 ""
@@ -33794,7 +33864,7 @@ msgstr "Betriebskosten (Gesellschaft Währung)"
msgid "Operating Cost Per BOM Quantity"
msgstr "Betriebskosten pro Stücklistenmenge"
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr "Betriebskosten gemäß Fertigungsauftrag / Stückliste"
@@ -33950,7 +34020,7 @@ msgstr "Arbeitsvorbereitung"
msgid "Operations Routing"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr "Der Betrieb kann nicht leer sein"
@@ -34542,7 +34612,7 @@ msgstr "Erlaubte Mehrlieferung/-annahme (%)"
msgid "Over Picking Allowance"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr "Mehreingang"
@@ -34994,7 +35064,7 @@ msgstr "Verpackter Artikel"
msgid "Packed Items"
msgstr "Verpackte Artikel"
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr "Verpackte Artikel können nicht intern transferiert werden"
@@ -35029,7 +35099,7 @@ msgstr "Packzettel"
msgid "Packing Slip Item"
msgstr "Position auf dem Packzettel"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr "Packzettel storniert"
@@ -35115,7 +35185,7 @@ msgstr "Bezahlt"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35390,7 +35460,7 @@ msgstr ""
msgid "Partial Payment in POS Transactions are not allowed."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr "Teilweise Bestandsreservierung"
@@ -35584,9 +35654,9 @@ msgstr "Teile pro 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35747,9 +35817,9 @@ msgstr "Parteispezifischer 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35914,7 +35984,7 @@ msgstr "Payer Einstellungen"
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -36050,7 +36120,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr "Zahlungsbuchung wurde geändert, nachdem sie abgerufen wurde. Bitte erneut abrufen."
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr "Payment Eintrag bereits erstellt"
@@ -36259,7 +36329,7 @@ msgstr "Bezahlung Referenzen"
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36285,11 +36355,11 @@ msgstr "Zahlungsauftragstyp"
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr "Eine Zahlungsanforderung, die aus einem Auftrag oder einer Bestellung erstellt wurde, wird im Entwurfsstatus sein. Falls deaktiviert, wird das Dokument in ungespeichertem Zustand sein."
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr "Zahlungsanforderung für {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr "Die Zahlungsanforderung wurde bereits erstellt"
@@ -36447,7 +36517,7 @@ msgstr "Zahlungs-URL"
msgid "Payment Unlink Error"
msgstr "Fehler beim Aufheben der Zahlungsverknüpfung"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr "Zahlung zu {0} {1} kann nicht größer als ausstehender Betrag {2} sein"
@@ -36768,7 +36838,7 @@ msgstr "Periode"
msgid "Period Based On"
msgstr "Zeitraum basierend auf"
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr "Zeitraum geschlossen"
@@ -37371,7 +37441,7 @@ msgstr "Bitte fügen Sie das Konto der Root-Ebene Company - {} hinzu"
msgid "Please add {1} role to user {0}."
msgstr "Bitte fügen Sie dem Benutzer {0} die Rolle {1} hinzu."
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr "Bitte passen Sie die Menge an oder bearbeiten Sie {0}, um fortzufahren."
@@ -37379,7 +37449,7 @@ msgstr "Bitte passen Sie die Menge an oder bearbeiten Sie {0}, um fortzufahren."
msgid "Please attach CSV file"
msgstr "Bitte CSV-Datei anhängen"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr "Bitte stornieren und berichtigen Sie die Zahlung"
@@ -37392,7 +37462,7 @@ msgstr "Bitte stornieren Sie die Zahlung zunächst manuell"
msgid "Please cancel related transaction."
msgstr "Bitte stornieren Sie die entsprechende Transaktion."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr "Bitte die Option \"Unterschiedliche Währungen\" aktivieren um Konten mit anderen Währungen zu erlauben"
@@ -37469,7 +37539,7 @@ msgstr "Bitte erstellen Sie eine Kaufquittung oder eine Eingangsrechnungen für
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr "Bitte löschen Sie das Produktbündel {0}, bevor Sie {1} mit {2} zusammenführen"
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr ""
@@ -37593,7 +37663,7 @@ msgstr "Bitte zuerst Eingangsbeleg eingeben"
msgid "Please enter Receipt Document"
msgstr "Bitte geben Sie Eingangsbeleg"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr "Bitte den Stichtag eingeben"
@@ -37718,8 +37788,8 @@ msgstr "Bitte sicher stellen, dass wirklich alle Transaktionen dieses Unternehme
msgid "Please mention 'Weight UOM' along with Weight."
msgstr "Bitte geben Sie neben dem Gewicht auch die entsprechende Mengeneinheit an."
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr "Bitte erwähnen Sie '{0}' in Unternehmen: {1}"
@@ -37847,7 +37917,7 @@ msgstr "Bitte erst Buchungsdatum und dann die Partei auswählen"
msgid "Please select Posting Date first"
msgstr "Bitte zuerst ein Buchungsdatum auswählen"
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr "Bitte eine Preisliste auswählen"
@@ -37879,7 +37949,7 @@ msgstr "Bitte wählen Sie \"Unterauftrag\" anstatt \"Bestellung\" {0}"
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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr "Bitte Stückliste auwählen"
@@ -37969,6 +38039,10 @@ msgstr "Bitte einen Wert für {0} Angebot an {1} auswählen"
msgid "Please select an item code before setting the warehouse."
msgstr "Bitte wählen Sie einen Artikelcode aus, bevor Sie das Lager festlegen."
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:26
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr ""
@@ -37977,7 +38051,7 @@ msgstr ""
msgid "Please select atleast one operation to create Job Card"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr "Bitte richtiges Konto auswählen"
@@ -38058,15 +38132,15 @@ msgstr "Bitte zuerst {0} auswählen"
msgid "Please set 'Apply Additional Discount On'"
msgstr "Bitte \"Zusätzlichen Rabatt anwenden auf\" aktivieren"
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr "Bitte setzen Sie die Kostenstelle für Abschreibungen von Vermögenswerten für das Unternehmen {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr "Bitte setzen Sie \"Gewinn-/Verlustrechnung auf die Veräußerung von Vermögenswerten\" für Unternehmen {0}"
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr "Bitte stellen Sie '{0}' in Unternehmen ein: {1}"
@@ -38074,7 +38148,7 @@ msgstr "Bitte stellen Sie '{0}' in Unternehmen ein: {1}"
msgid "Please set Account"
msgstr "Bitte legen Sie ein Konto fest"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr "Bitte Konto für Wechselgeldbetrag festlegen"
@@ -38100,7 +38174,7 @@ msgstr "Bitte legen Sie die Buchhaltungsdimension {} in {} fest"
msgid "Please set Company"
msgstr "Bitte Unternehmen angeben"
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr "Bitte stellen Sie die Abschreibungskonten in der Anlagenkategorie {0} oder im Unternehmen {1} ein"
@@ -38118,7 +38192,7 @@ msgstr "Bitte setzen Sie den Steuercode für den Kunden '%s'"
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr "Bitte setzen Sie den Steuercode für die öffentliche Verwaltung '%s'"
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr ""
@@ -38181,7 +38255,7 @@ msgstr "Bitte Konto in Lager {0} setzen"
msgid "Please set an Address on the Company '%s'"
msgstr "Bitte geben Sie eine Adresse für das Unternehmen „%s“ ein"
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr "Bitte legen Sie in der Artikeltabelle ein Aufwandskonto fest"
@@ -38197,23 +38271,23 @@ msgstr "Bitte setzen Sie mindestens eine Zeile in die Tabelle Steuern und Abgabe
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr "Bitte tragen Sie ein Bank- oder Kassenkonto in Zahlungsweise {0} ein"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr "Bitte tragen Sie ein Bank- oder Kassenkonto in Zahlungsweise {} ein"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "Bitte tragen Sie jeweils ein Bank- oder Kassenkonto in Zahlungsweisen {} ein"
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr "Bitte legen Sie im Unternehmen {} das Standardkonto für Wechselkursgewinne/-verluste fest"
@@ -38317,7 +38391,7 @@ msgstr "Bitte setzen Sie {0} auf {1}, das gleiche Konto, das in der ursprünglic
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr "Bitte richten Sie ein Gruppenkonto mit dem Kontotyp - {0} für die Firma {1} ein und aktivieren Sie es"
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr "Bitte teilen Sie diese E-Mail mit Ihrem Support-Team, damit es das Problem finden und beheben kann."
@@ -38330,7 +38404,7 @@ msgid "Please specify Company"
msgstr "Bitte Unternehmen angeben"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr "Bitte Unternehmen angeben um fortzufahren"
@@ -38503,6 +38577,7 @@ msgstr "Portoaufwendungen"
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38537,11 +38612,11 @@ msgstr "Portoaufwendungen"
#: 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38560,6 +38635,7 @@ msgstr "Portoaufwendungen"
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38569,6 +38645,7 @@ msgstr "Portoaufwendungen"
#: 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_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
@@ -39134,6 +39211,14 @@ msgstr "Artikelcode der Preisregel"
msgid "Pricing Rule Item Group"
msgstr "Artikelgruppe für Preisregel"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr ""
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr ""
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr "Die Preisregel {0} wurde aktualisiert"
@@ -39192,6 +39277,10 @@ msgstr "Die Preisregel {0} wurde aktualisiert"
msgid "Pricing Rules"
msgstr "Preisregeln"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr ""
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39579,7 +39668,7 @@ msgstr "Prozessbeschreibung"
msgid "Process Loss"
msgstr "Prozessverlust"
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr "Der Prozentsatz der Prozessverluste kann nicht größer als 100 sein"
@@ -40069,7 +40158,7 @@ msgstr "Fortschritt (%)"
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40544,7 +40633,7 @@ msgstr "Einkaufsanalyse"
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr "Kaufdatum"
@@ -40700,7 +40789,7 @@ msgstr "Einkaufsstammdaten-Manager"
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40876,9 +40965,9 @@ msgstr "Einkaufspreisliste"
#. 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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41759,6 +41848,7 @@ msgstr "Qualitätsüberprüfungsziel"
#: 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/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
@@ -41875,7 +41965,7 @@ msgstr "Menge darf nicht mehr als {0} sein"
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr "Menge eines Artikels nach der Herstellung/dem Umpacken auf Basis vorgegebener Mengen von Rohmaterial"
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr "Für Artikel {0} in Zeile {1} benötigte Menge"
@@ -42724,7 +42814,7 @@ msgid "Reason"
msgstr "Grund"
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "Grund für das auf Eis legen"
@@ -43160,7 +43250,7 @@ msgstr "Gegen einlösen"
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr "Treuepunkte einlösen"
@@ -43292,7 +43382,7 @@ msgstr "Referenzdatum"
msgid "Reference"
msgstr "Referenz"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr "Referenz #{0} vom {1}"
@@ -43430,7 +43520,7 @@ msgstr "Referenzname"
msgid "Reference No"
msgstr "Referenznummer"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr "Referenznr. & Referenz-Tag sind erforderlich für {0}"
@@ -43438,11 +43528,11 @@ msgstr "Referenznr. & Referenz-Tag sind erforderlich für {0}"
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr "Referenznummer und Referenzdatum sind Pflichtfelder"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr "Referenznummer ist ein Pflichtfeld, wenn ein Referenzdatum eingegeben wurde"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr "Referenznummer."
@@ -43556,11 +43646,11 @@ msgstr "Referenz: {0}, Item Code: {1} und Kunde: {2}"
msgid "References"
msgstr "Referenzen"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr "Verweise auf Ausgangsrechnungen sind unvollständig"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr "Referenzen zu Kundenaufträgen sind unvollständig"
@@ -43705,8 +43795,8 @@ msgstr "Beziehung"
#. 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43725,7 +43815,7 @@ msgstr "Freistellungsdatum"
msgid "Remaining"
msgstr "Verbleibend"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr ""
@@ -43738,7 +43828,7 @@ msgstr "Verbleibendes Saldo"
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr "Bemerkung"
@@ -43787,7 +43877,7 @@ msgstr "Bemerkung"
#: 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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -44099,7 +44189,7 @@ msgstr ""
msgid "Repost Status"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr ""
@@ -44423,7 +44513,7 @@ msgstr "Wählen Sie erneut, wenn der ausgewählte Kontakt nach dem Speichern bea
msgid "Reseller"
msgstr "Wiederverkäufer"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr "Zahlungsemail erneut senden"
@@ -44892,7 +44982,7 @@ msgstr "Retoure"
msgid "Return / Credit Note"
msgstr "Return / Gutschrift"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr "Rückgabe / Lastschrift"
@@ -45416,12 +45506,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1919
msgid "Row #{0} (Payment Table): Amount must be negative"
msgstr "Zeile {0} (Zahlungstabelle): Betrag muss negativ sein"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:515
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "Zeile {0} (Zahlungstabelle): Betrag muss positiv sein"
@@ -45567,7 +45657,7 @@ msgstr "Referenz {1} {2} in Zeile {0} kommt doppelt vor"
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr "Zeile {0}: Voraussichtlicher Liefertermin kann nicht vor Bestelldatum sein"
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr "Zeile #{0}: Aufwandskonto für den Artikel nicht festgelegt {1}. {2}"
@@ -45591,11 +45681,11 @@ msgstr "Zeile #{0}: Fertigerzeugnis muss {1} sein"
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr "Zeile #{0}: Fertigerzeugnis-Referenz ist obligatorisch für Ausschussartikel {1}."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr "Zeile #{0}: Für {1} können Sie den Referenzbeleg nur auswählen, wenn das Konto belastet wird"
@@ -45615,7 +45705,7 @@ msgstr "Zeile {0}: Element hinzugefügt"
msgid "Row #{0}: Item {1} does not exist"
msgstr "Zeile #{0}: Artikel {1} existiert nicht"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr "Zeile #{0}: Artikel {1} wurde kommissioniert, bitte reservieren Sie den Bestand aus der Pickliste."
@@ -45651,7 +45741,7 @@ msgstr "Zeile #{0}: Der nächste Abschreibungstermin kann nicht vor dem Einkaufs
msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
msgstr "Zeile {0}: Es ist nicht erlaubt den Lieferanten zu wechseln, da bereits eine Bestellung vorhanden ist"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr "Zeile #{0}: Nur {1} zur Reservierung für den Artikel {2} verfügbar"
@@ -45696,15 +45786,15 @@ msgstr "Zeile #{0}: Menge muss eine positive Zahl sein"
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 "Zeile #{0}: Die Menge sollte kleiner oder gleich der verfügbaren Menge zum Reservieren sein (Ist-Menge – reservierte Menge) {1} für Artikel {2} der Charge {3} im Lager {4}."
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr "Zeile {0}: Für Artikel {1} ist eine Qualitätsprüfung erforderlich"
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr "Zeile {0}: Qualitätsprüfung {1} wurde für den Artikel {2} nicht gebucht"
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr "Zeile {0}: Qualitätsprüfung {1} wurde für Artikel {2} abgelehnt"
@@ -45713,7 +45803,7 @@ msgstr "Zeile {0}: Qualitätsprüfung {1} wurde für Artikel {2} abgelehnt"
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "Zeile {0}: Artikelmenge {1} kann nicht Null sein."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr "Zeile #{0}: Die zu reservierende Menge für den Artikel {1} sollte größer als 0 sein."
@@ -45807,19 +45897,19 @@ msgstr "Zeile {0}: Status muss {1} für Rechnungsrabatt {2} sein"
msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}."
msgstr "Zeile #{0}: Der Bestand kann nicht für Artikel {1} für eine deaktivierte Charge {2} reserviert werden."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr "Zeile #{0}: Lagerbestand kann nicht für einen Artikel ohne Lagerhaltung reserviert werden {1}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr "Zeile #{0}: Bestand kann nicht im Gruppenlager {1} reserviert werden."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr "Zeile #{0}: Für den Artikel {1} ist bereits ein Lagerbestand reserviert."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr "Zeile #{0}: Der Bestand ist für den Artikel {1} im Lager {2} reserviert."
@@ -45827,8 +45917,8 @@ msgstr "Zeile #{0}: Der Bestand ist für den Artikel {1} im Lager {2} reserviert
msgid "Row #{0}: Stock not available to reserve for Item {1} against Batch {2} in Warehouse {3}."
msgstr "Zeile #{0}: Bestand nicht verfügbar für Artikel {1} von Charge {2} im Lager {3}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr "Zeile #{0}: Kein Bestand für den Artikel {1} im Lager {2} verfügbar."
@@ -46009,7 +46099,7 @@ msgstr "Zeile {0}# Artikel {1} wurde in der Tabelle „Gelieferte Rohstoffe“ i
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr "Zeile {0}: Die akzeptierte Menge und die abgelehnte Menge können nicht gleichzeitig Null sein."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr "Zeile {0}: Konto {1} und Parteityp {2} haben unterschiedliche Kontotypen"
@@ -46017,11 +46107,11 @@ msgstr "Zeile {0}: Konto {1} und Parteityp {2} haben unterschiedliche Kontotypen
msgid "Row {0}: Activity Type is mandatory."
msgstr "Zeile {0}: Leistungsart ist obligatorisch."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr "Zeile {0}: Voraus gegen Kunde muss Kredit"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr "Zeile {0}: Voraus gegen Lieferant muss belasten werden"
@@ -46041,7 +46131,7 @@ msgstr "Zeile {0}: Da {1} aktiviert ist, können dem {2}-Eintrag keine Rohstoffe
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr "Zeile {0}: Bill of Materials nicht für den Artikel gefunden {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr "Zeile {0}: Sowohl Soll als auch Haben können nicht gleich Null sein"
@@ -46057,7 +46147,7 @@ msgstr "Zeile {0}: Die Kostenstelle {1} gehört nicht zum Unternehmen {2}"
msgid "Row {0}: Cost center is required for an item {1}"
msgstr "Zeile {0}: Kostenstelle ist für einen Eintrag {1} erforderlich"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr "Zeile {0}: Habenbuchung kann nicht mit ein(em) {1} verknüpft werden"
@@ -46065,7 +46155,7 @@ msgstr "Zeile {0}: Habenbuchung kann nicht mit ein(em) {1} verknüpft werden"
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr "Zeile {0}: Währung der Stückliste # {1} sollte der gewählten Währung entsprechen {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr "Zeile {0}: Sollbuchung kann nicht mit ein(em) {1} verknüpft werden"
@@ -46081,7 +46171,7 @@ msgstr "Zeile {0}: Fälligkeitsdatum in der Tabelle "Zahlungsbedingungen&qu
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr "Zeile {0}: Entweder die Referenz zu einem \"Lieferschein-Artikel\" oder \"Verpackter Artikel\" ist obligatorisch."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "Zeile {0}: Wechselkurs ist erforderlich"
@@ -46115,7 +46205,7 @@ msgstr "Zeile {0}: Von Zeit und zu Zeit ist obligatorisch."
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr "Zeile {0}: Zeitüberlappung in {1} mit {2}"
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr "Zeile {0}: Von Lager ist obligatorisch für interne Transfers"
@@ -46127,7 +46217,7 @@ msgstr "Zeile {0}: Von Zeit zu Zeit muss kleiner sein"
msgid "Row {0}: Hours value must be greater than zero."
msgstr "Zeile {0}: Stunden-Wert muss größer als Null sein."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr "Zeile {0}: Ungültige Referenz {1}"
@@ -46151,7 +46241,7 @@ msgstr "Zeile {0}: Artikel {1} muss ein an Dritte vergebener Artikel sein."
msgid "Row {0}: Item {1}'s quantity cannot be higher than the available quantity."
msgstr "Zeile {0}: Die Menge des Artikels {1} kann nicht höher sein als die verfügbare Menge."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr "Zeile {0}: Verpackte Menge muss gleich der {1} Menge sein."
@@ -46159,7 +46249,7 @@ msgstr "Zeile {0}: Verpackte Menge muss gleich der {1} Menge sein."
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr "Zeile {0}: Für den Artikel {1} wurde bereits ein Packzettel erstellt."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr "Zeile {0}: Partei / Konto stimmt nicht mit {1} / {2} in {3} {4} überein"
@@ -46171,11 +46261,11 @@ msgstr "Zeile {0}: Partei-Typ und Partei sind für Forderungen-/Verbindlichkeite
msgid "Row {0}: Payment Term is mandatory"
msgstr "Zeile {0}: Zahlungsbedingung ist obligatorisch"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr "Zeile {0}: \"Zahlung zu Auftrag bzw. Bestellung\" sollte immer als \"Vorkasse\" eingestellt werden"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr "Zeile {0}: Wenn es sich um eine Vorkasse-Buchung handelt, bitte \"Ist Vorkasse\" zu Konto {1} anklicken, ."
@@ -46243,7 +46333,7 @@ msgstr "Zeile {0}: Schicht kann nicht geändert werden, da die Abschreibung bere
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr "Zeile {0}: Unterauftragsartikel sind für den Rohstoff {1} obligatorisch."
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr "Zeile {0}: Ziellager ist für interne Transfers obligatorisch"
@@ -46267,7 +46357,7 @@ msgstr "Zeile {0}: Um die Periodizität {1} festzulegen, muss die Differenz zwis
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "Zeile {0}: Umrechnungsfaktor für Maßeinheit ist zwingend erforderlich"
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr "Zeile {0}: Arbeitsplatz oder Arbeitsplatztyp ist obligatorisch für einen Vorgang {1}"
@@ -46288,7 +46378,7 @@ msgstr "Zeile {0}: {1} muss größer als 0 sein"
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr "Zeile {0}: {1} {2} kann nicht identisch mit {3} (Konto der Partei) {4} sein"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr "Zeile {0}: {1} {2} stimmt nicht mit {3} überein"
@@ -46681,7 +46771,7 @@ msgstr ""
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr "Ausgangsrechnung {0} wurde bereits gebucht"
@@ -46910,7 +47000,7 @@ msgstr "Auftragsstatus"
msgid "Sales Order Trends"
msgstr "Trendanalyse Aufträge"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr "Auftrag für den Artikel {0} erforderlich"
@@ -47420,8 +47510,8 @@ msgstr "Samstag"
#: 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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47692,7 +47782,7 @@ msgstr "Ausschussmaterialkosten (Unternehmenswährung)"
msgid "Scrap Warehouse"
msgstr "Ausschusslager"
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr ""
@@ -47765,7 +47855,7 @@ msgstr "Sekretär:in"
msgid "Section"
msgstr "Sektion"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr "Abschnittscode"
@@ -48136,7 +48226,7 @@ msgstr "Wählen Sie, um den Kunden mit diesen Feldern durchsuchbar zu machen"
msgid "Selected POS Opening Entry should be open."
msgstr "Der ausgewählte POS-Eröffnungseintrag sollte geöffnet sein."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr "Die ausgewählte Preisliste sollte die Kauf- und Verkaufsfelder überprüft haben."
@@ -48320,7 +48410,7 @@ msgstr "Senden mit Anhang"
msgid "Sender"
msgstr "Absender"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr "Versand"
@@ -48444,7 +48534,9 @@ msgstr ""
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48475,7 +48567,9 @@ msgid "Serial No Count"
msgstr "Seriennummern gezählt"
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr ""
@@ -48483,7 +48577,7 @@ msgstr ""
msgid "Serial No Range"
msgstr "Seriennummernbereich"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr "Seriennummer reserviert"
@@ -48523,6 +48617,13 @@ msgstr "Seriennummer und Chargen"
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr ""
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr ""
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr "Seriennummer ist obligatorisch"
@@ -48552,7 +48653,7 @@ msgstr "Seriennummer {0} gehört nicht zu Artikel {1}"
msgid "Serial No {0} does not exist"
msgstr "Seriennummer {0} existiert nicht"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr "Seriennummer {0} existiert nicht"
@@ -48601,7 +48702,7 @@ msgstr "Serien-/Chargennummern"
msgid "Serial Nos and Batches"
msgstr "Seriennummern und Chargen"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr "Seriennummern wurden erfolgreich erstellt"
@@ -48679,11 +48780,11 @@ msgstr "Seriennummer und Charge"
msgid "Serial and Batch Bundle"
msgstr "Serien- und Chargenbündel"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr "Serien- und Chargenbündel erstellt"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr "Serien- und Chargenbündel aktualisiert"
@@ -49117,7 +49218,7 @@ msgstr ""
msgid "Set Loyalty Program"
msgstr "Treueprogramm eintragen"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr "Neues Veröffentlichungsdatum festlegen"
@@ -49372,7 +49473,7 @@ msgstr ""
msgid "Setting up company"
msgstr "Firma gründen"
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49556,7 +49657,7 @@ msgstr "Sendungstyp"
msgid "Shipment details"
msgstr "Sendungsdetails"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr "Lieferungen"
@@ -49803,6 +49904,10 @@ msgstr "Abgebrochene Einträge anzeigen"
msgid "Show Completed"
msgstr "Show abgeschlossen"
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr ""
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr "Kumulativen Betrag anzeigen"
@@ -49918,7 +50023,7 @@ msgstr "Vorschau anzeigen"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr "Bemerkungen anzeigen"
@@ -50225,13 +50330,27 @@ msgstr "Quelle"
msgid "Source DocType"
msgstr "Quelle DocType"
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr ""
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr "Quelldokumentname"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr ""
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr "Quelldokumenttyp"
@@ -50302,7 +50421,7 @@ msgstr "Adresse des Quelllagers"
msgid "Source Warehouse Address Link"
msgstr "Link zur Quelllageradresse"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr "Ausgangslager ist für Zeile {0} zwingend erforderlich."
@@ -50813,7 +50932,7 @@ msgstr "Staat / Provinz"
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51156,7 +51275,7 @@ msgstr "Lagerbuchung {0} erstellt"
msgid "Stock Entry {0} has created"
msgstr "Lagerbuchung {0} erstellt"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr "Lagerbewegung {0} ist nicht gebucht"
@@ -51379,13 +51498,13 @@ msgstr ""
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51394,13 +51513,13 @@ msgstr ""
msgid "Stock Reservation"
msgstr "Bestandsreservierung"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr "Bestandsreservierungen storniert"
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr "Bestandsreservierungen erstellt"
@@ -51422,7 +51541,7 @@ msgstr "Der Bestandsreservierungseintrag kann nicht aktualisiert werden, da er b
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 "Ein anhand einer Kommissionierliste erstellter Bestandsreservierungseintrag kann nicht aktualisiert werden. Wenn Sie Änderungen vornehmen müssen, empfehlen wir, den vorhandenen Eintrag zu stornieren und einen neuen zu erstellen."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr ""
@@ -51667,7 +51786,7 @@ msgstr "Lager und Fertigung"
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr "In der Lager-Gruppe {0} kann kein Bestand reserviert werden."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr "In der Lager-Gruppe {0} kann kein Bestand reserviert werden."
@@ -51683,7 +51802,7 @@ 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 "Der Bestand kann nicht aktualisiert werden, da die Eingangsrechnung einen Direktversand-Artikel enthält. Bitte deaktivieren Sie 'Lagerbestand aktualisieren' oder entfernen Sie den Direktversand-Artikel."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr ""
@@ -52551,10 +52670,15 @@ msgstr "Gelieferte Anzahl"
#: 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "Lieferant"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr ""
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52667,7 +52791,7 @@ msgstr "Lieferantenrechnung"
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr "Lieferantenrechnungsdatum"
@@ -52681,8 +52805,8 @@ msgstr "Lieferant Rechnungsdatum kann nicht größer sein als Datum der Veröffe
#: 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "Lieferantenrechnungsnr."
@@ -53229,16 +53353,16 @@ msgstr ""
msgid "System will notify to increase or decrease quantity or amount "
msgstr "Das System benachrichtigt Sie, um die Menge oder Menge zu erhöhen oder zu verringern"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr "Quellensteuerbetrag (TCS)"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr "Quellensteuersatz (TCS) %"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr "Quellensteuerbetrag (TDS)"
@@ -53255,7 +53379,7 @@ msgstr ""
msgid "TDS Payable"
msgstr "Fällige Quellensteuer (TDS)"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr "Quellensteuersatz (TDS) %"
@@ -53811,7 +53935,7 @@ msgstr "Steuerart"
msgid "Tax Withheld Vouchers"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr ""
@@ -54437,7 +54561,7 @@ msgstr "Der Zugriff auf die Angebotsanfrage vom Portal ist deaktiviert. Um den Z
msgid "The BOM which will be replaced"
msgstr "Die Stückliste (BOM) wird ersetzt."
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr "Die Charge {0} hat eine negative Menge {1} im Lager {2}. Bitte korrigieren Sie die Menge."
@@ -54465,7 +54589,7 @@ msgstr "Die Hauptbucheinträge werden im Hintergrund storniert, dies kann einige
msgid "The Loyalty Program isn't valid for the selected company"
msgstr "Das Treueprogramm ist für das ausgewählte Unternehmen nicht gültig"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr "Die Auszahlungsanforderung {0} ist bereits bezahlt, die Zahlung kann nicht zweimal verarbeitet werden"
@@ -54489,7 +54613,7 @@ msgstr "Der Verkäufer ist mit {0} verknüpft"
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr "Die Seriennummer in Zeile #{0}: {1} ist im Lager {2} nicht verfügbar."
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr "Die Seriennummer {0} ist für {1} {2} reserviert und kann für keine andere Transaktion verwendet werden."
@@ -54511,7 +54635,7 @@ msgstr "Der Arbeitsauftrag ist obligatorisch für den Demontageauftrag"
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr "Der Kontenkopf unter Eigen- oder Fremdkapital, in dem Gewinn / Verlust verbucht wird"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr "Der zugewiesene Betrag ist größer als der ausstehende Betrag der Zahlungsanforderung {0}"
@@ -54552,7 +54676,7 @@ msgstr "Das Feld Von Anteilseigner darf nicht leer sein"
msgid "The field To Shareholder cannot be blank"
msgstr "Das Feld An Anteilseigner darf nicht leer sein"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr "Das Feld {0} in der Zeile {1} ist nicht gesetzt"
@@ -54568,7 +54692,7 @@ msgstr "Die Folionummern stimmen nicht überein"
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr "Die folgenden Artikel, für die Einlagerungsregeln gelten, konnten nicht untergebracht werden:"
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr "Bei den folgenden Vermögensgegenständen wurden die Abschreibungen nicht automatisch gebucht: {0}"
@@ -54829,6 +54953,10 @@ msgstr ""
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr "Es gibt aktive Wartungs- oder Reparaturarbeiten am Vermögenswert. Sie müssen alle Schritte ausführen, bevor Sie das Asset stornieren können."
@@ -55095,7 +55223,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr "Dieser Zeitplan wurde erstellt, als der Vermögensgegenstand {0} nach der Stornierung der Vermögensgegenstand-Aktivierung {1} wiederhergestellt wurde."
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr "Dieser Zeitplan wurde erstellt, als der Vermögensgegenstand {0} wiederhergestellt wurde."
@@ -55103,7 +55231,7 @@ msgstr "Dieser Zeitplan wurde erstellt, als der Vermögensgegenstand {0} wiederh
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr "Dieser Zeitplan wurde erstellt, als der Vermögensgegenstand {0} über die Ausgangsrechnung {1} zurückgegeben wurde."
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr "Dieser Zeitplan wurde erstellt, als der Vermögensgegenstand {0} verschrottet wurde."
@@ -55878,6 +56006,10 @@ msgstr "Um Steuern im Artikelpreis in Zeile {0} einzubeziehen, müssen Steuern i
msgid "To merge, following properties must be same for both items"
msgstr "Um zwei Produkte zusammenzuführen, müssen folgende Eigenschaften für beide Produkte gleich sein"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr "Um dies zu überschreiben, aktivieren Sie '{0}' in Firma {1}"
@@ -55895,7 +56027,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr "Um die Rechnung ohne Eingangsbeleg zu buchen, stellen Sie bitte {0} als {1} in {2} ein"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr ""
@@ -56117,7 +56249,7 @@ msgstr "Gesamte Zuteilungen"
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56279,7 +56411,7 @@ msgstr "Der Gesamtkreditbetrag sollte identisch mit dem verknüpften Buchungssat
msgid "Total Debit"
msgstr "Gesamt-Soll"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr "Gesamt-Soll muss gleich Gesamt-Haben sein. Die Differenz ist {0}"
@@ -56872,6 +57004,10 @@ msgstr "Summen"
msgid "Traceability"
msgstr "Rückverfolgbarkeit"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr ""
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56912,7 +57048,7 @@ msgstr "Tracking-URL"
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -57010,7 +57146,7 @@ msgstr "Transaktionseinstellungen"
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr "Art der Transaktion"
@@ -57032,7 +57168,7 @@ msgstr "Transaktion Referenznummer {0} vom {1}"
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57629,7 +57765,11 @@ msgstr "Nicht zugewiesener Betrag"
msgid "Unassigned Qty"
msgstr "Nicht zugewiesene Menge"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr "Rechnung entsperren"
@@ -58996,7 +59136,7 @@ msgstr ""
msgid "Vendor Invoices"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr "Herstellername"
@@ -59063,7 +59203,7 @@ msgstr "Video-Einstellungen"
#: 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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59254,11 +59394,11 @@ msgstr "Beleg"
#: 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59293,7 +59433,7 @@ msgstr "Beleg Menge"
#. 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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr "Beleg Untertyp"
@@ -59325,9 +59465,9 @@ msgstr "Beleg Untertyp"
#: 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59346,6 +59486,7 @@ msgstr "Beleg Untertyp"
#: 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_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
@@ -59555,6 +59696,7 @@ msgstr "Laufkundschaft"
#: 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_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
@@ -59663,7 +59805,7 @@ msgstr "Lager und Referenz"
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr "Lager kann nicht gelöscht werden, da es Buchungen im Lagerbuch gibt."
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr "Lager kann für Seriennummer nicht geändert werden"
@@ -59676,7 +59818,7 @@ msgid "Warehouse not found against the account {0}"
msgstr "Lager für Konto {0} nicht gefunden"
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr "Angabe des Lagers ist für den Lagerartikel {0} erforderlich"
@@ -59827,7 +59969,7 @@ msgstr "Warnung vor negativem Bestand"
msgid "Warning!"
msgstr "Warnung!"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr "Achtung: Zu Lagerbuchung {2} gibt es eine andere Gegenbuchung {0} # {1}"
@@ -60310,6 +60452,7 @@ msgstr "In Arbeit befindliches 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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "Arbeitsauftrag"
@@ -60785,7 +60928,7 @@ msgstr "Sie importieren Daten für die Codeliste:"
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr "Sie dürfen nicht gemäß den im {} Workflow festgelegten Bedingungen aktualisieren."
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr "Sie haben keine Berechtigung Buchungen vor {0} hinzuzufügen oder zu aktualisieren"
@@ -60817,7 +60960,7 @@ msgstr "Sie können auch das Standard-CWIP-Konto in Firma {} festlegen"
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr "Sie können das übergeordnete Konto in ein Bilanzkonto ändern oder ein anderes Konto auswählen."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr "Momentan können keine Belege in die Spalte \"Zu Buchungssatz\" eingegeben werden"
@@ -60834,7 +60977,7 @@ msgstr "Sie können maximal {0} Punkte in dieser Reihenfolge einlösen."
msgid "You can only select one mode of payment as default"
msgstr "Sie können nur eine Zahlungsweise als Standard auswählen"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr "Sie können bis zu {0} einlösen."
@@ -60866,11 +61009,11 @@ msgstr "Sie können innerhalb der abgeschlossenen Abrechnungsperiode {1} kein(e)
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr "Sie können im abgeschlossenen Abrechnungszeitraum {0} keine Buchhaltungseinträge mit erstellen oder stornieren."
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr "Bis zu diesem Datum können Sie keine Buchungen erstellen/berichtigen."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr "Eine gleichzeitige Gutschrift und Belastung desselben Kontos ist nicht möglich"
@@ -60886,7 +61029,7 @@ msgstr "Sie können den Stammknoten nicht bearbeiten."
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr "Sie können nicht mehr als {0} einlösen."
@@ -60918,7 +61061,7 @@ msgstr "Sie haben keine Berechtigungen für {} Elemente in einem {}."
msgid "You don't have enough Loyalty Points to redeem"
msgstr "Sie haben nicht genügend Treuepunkte zum Einlösen"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr "Sie haben nicht genug Punkte zum Einlösen."
@@ -61344,7 +61487,7 @@ msgstr "Titel"
msgid "to"
msgstr "An"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr ""
@@ -61384,7 +61527,7 @@ msgstr "{0}"
msgid "{0} '{1}' is disabled"
msgstr "{0} '{1}' ist deaktiviert"
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr "{0} '{1}' nicht im Geschäftsjahr {2}"
@@ -61416,7 +61559,7 @@ msgstr "Verwendeter {0} -Coupon ist {1}. Zulässige Menge ist erschöpft"
msgid "{0} Digest"
msgstr "{0} Zusammenfassung"
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr "{0} Nummer {1} wird bereits in {2} {3} verwendet"
@@ -61432,7 +61575,7 @@ msgstr "{0} Anfrage für {1}"
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr "{0} Probe aufbewahren basiert auf Charge. Bitte aktivieren Sie die Option Chargennummer, um die Probe des Artikels aufzubewahren"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr "{0} Transaktion(en) Abgestimmt"
@@ -61448,19 +61591,19 @@ msgstr "Konto {0} ist nicht vom Typ {1}"
msgid "{0} account not found while submitting purchase receipt"
msgstr "Konto {0} beim Buchen des Eingangsbelegs nicht gefunden"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr "{0} zu Rechnung {1} vom {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr "{0} zu Bestellung {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr "{0} zu Ausgangsrechnung {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr "{0} zu Auftrag {1}"
@@ -61468,7 +61611,7 @@ msgstr "{0} zu Auftrag {1}"
msgid "{0} already has a Parent Procedure {1}."
msgstr "{0} hat bereits eine übergeordnete Prozedur {1}."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr "{0} und {1}"
@@ -61527,7 +61670,7 @@ msgstr "{0} in Artikelsteuer doppelt eingegeben"
msgid "{0} entered twice {1} in Item Taxes"
msgstr ""
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr "{0} für {1}"
@@ -61580,7 +61723,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr "{0} Artikel ist zwingend erfoderlich für {1}"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr "{0} ist für Konto {1} obligatorisch"
@@ -61655,7 +61798,7 @@ msgstr "{0} Elemente hergestellt"
msgid "{0} must be negative in return document"
msgstr "{0} muss im Retourenschein negativ sein"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr ""
@@ -61671,7 +61814,7 @@ msgstr "Der Parameter {0} ist ungültig"
msgid "{0} payment entries can not be filtered by {1}"
msgstr "{0} Zahlungsbuchungen können nicht nach {1} gefiltert werden"
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr "Menge {0} des Artikels {1} wird im Lager {2} mit einer Kapazität von {3} empfangen."
@@ -61732,7 +61875,7 @@ msgstr "{0} {1}"
msgid "{0} {1} Manually"
msgstr "{0} {1} manuell"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr "{0} {1} Teilweise abgeglichen"
@@ -61797,7 +61940,7 @@ msgstr "{0} {1} wird abgebrochen oder beendet"
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr "{0} {1} wurde abgebrochen, deshalb kann die Aktion nicht abgeschlossen werden"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr "{0} {1} ist geschlossen"
@@ -61809,7 +61952,7 @@ msgstr "{0} {1} ist deaktiviert"
msgid "{0} {1} is frozen"
msgstr "{0} {1} ist gesperrt"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr "{0} {1} wird voll in Rechnung gestellt"
@@ -61821,12 +61964,12 @@ msgstr "{0} {1} ist nicht aktiv"
msgid "{0} {1} is not associated with {2} {3}"
msgstr "{0} {1} gehört nicht zu {2} {3}"
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr "{0} {1} befindet sich in keinem aktiven Geschäftsjahr"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr "{0} {1} ist nicht gebucht"
@@ -61838,7 +61981,7 @@ msgstr "{0} {1} liegt derzeit auf Eis"
msgid "{0} {1} must be submitted"
msgstr "{0} {1} muss gebucht werden"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr ""
@@ -61873,7 +62016,7 @@ msgstr "{0} {1}: Konto {2} ist inaktiv"
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr "{0} {1}: Konteneintrag für {2} kann nur in folgender Währung vorgenommen werden: {3}"
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr "{0} {1}: Kostenstelle ist zwingend erfoderlich für Artikel {2}"
@@ -61951,7 +62094,7 @@ msgstr "{doctype} {name} wurde abgebrochen oder geschlossen."
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr "Die Stichprobengröße von {item_name} ({sample_size}) darf nicht größer sein als die akzeptierte Menge ({accepted_quantity})"
@@ -61959,7 +62102,7 @@ msgstr "Die Stichprobengröße von {item_name} ({sample_size}) darf nicht größ
msgid "{ref_doctype} {ref_name} is {status}."
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr "{}"
@@ -62017,7 +62160,7 @@ msgstr "{} Ausstehend"
msgid "{} To Bill"
msgstr "{} Abzurechnen"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr "{} kann nicht storniert werden, da die gesammelten Treuepunkte eingelöst wurden. Brechen Sie zuerst das {} Nein {} ab"
diff --git a/erpnext/locale/eo.po b/erpnext/locale/eo.po
index 4b2cff5fe12..08f1a7961fa 100644
--- a/erpnext/locale/eo.po
+++ b/erpnext/locale/eo.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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:10\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:07\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Esperanto\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr "crwdns132090:0crwdne132090:0"
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr "crwdns62480:0crwdne62480:0"
msgid "'Default {0} Account' in Company {1}"
msgstr "crwdns62482:0{0}crwdnd62482:0{1}crwdne62482:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr "crwdns62484:0crwdne62484:0"
@@ -840,11 +840,11 @@ msgstr "crwdns148590:0crwdne148590:0"
msgid "Your Shortcuts"
msgstr "crwdns148592:0crwdne148592:0"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr "crwdns148848:0{0}crwdne148848:0"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr "crwdns148850:0{0}crwdne148850:0"
@@ -1215,10 +1215,10 @@ msgstr "crwdns152084:0{0}crwdnd152084:0{1}crwdne152084:0"
#: 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1523,7 +1523,7 @@ msgstr "crwdns62994:0{0}crwdnd62994:0{1}crwdne62994:0"
msgid "Account {0}: You can not assign itself as parent account"
msgstr "crwdns62996:0{0}crwdne62996:0"
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr "crwdns62998:0{0}crwdne62998:0"
@@ -2012,7 +2012,7 @@ msgstr "crwdns132278:0crwdne132278:0"
msgid "Accounts Manager"
msgstr "crwdns63226:0crwdne63226:0"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr "crwdns63228:0crwdne63228:0"
@@ -2199,7 +2199,7 @@ msgstr "crwdns63252:0crwdne63252:0"
msgid "Accounts User"
msgstr "crwdns63258:0crwdne63258:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr "crwdns63260:0crwdne63260:0"
@@ -2559,6 +2559,10 @@ msgstr "crwdns132326:0crwdne132326:0"
msgid "Actual Expense"
msgstr "crwdns63400:0crwdne63400:0"
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr "crwdns157444:0crwdne157444:0"
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2696,7 +2700,7 @@ msgstr "crwdns63462:0crwdne63462:0"
msgid "Add Child"
msgstr "crwdns63464:0crwdne63464:0"
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr "crwdns63466:0crwdne63466:0"
@@ -3502,7 +3506,7 @@ msgstr "crwdns132432:0crwdne132432:0"
msgid "Advance amount cannot be greater than {0} {1}"
msgstr "crwdns63854:0{0}crwdnd63854:0{1}crwdne63854:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr "crwdns63856:0{0}crwdnd63856:0{1}crwdnd63856:0{2}crwdne63856:0"
@@ -3559,7 +3563,7 @@ msgstr "crwdns111606:0crwdne111606:0"
#: 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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr "crwdns63874:0crwdne63874:0"
@@ -3628,7 +3632,7 @@ msgstr "crwdns132454:0crwdne132454:0"
msgid "Against Income Account"
msgstr "crwdns132456:0crwdne132456:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr "crwdns63908:0{0}crwdnd63908:0{1}crwdne63908:0"
@@ -3676,7 +3680,7 @@ msgstr "crwdns148756:0{0}crwdne148756: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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr "crwdns63928:0crwdne63928:0"
@@ -3688,7 +3692,7 @@ msgstr "crwdns63928:0crwdne63928:0"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr "crwdns63932:0crwdne63932:0"
@@ -3700,8 +3704,8 @@ msgstr "crwdns63932:0crwdne63932:0"
#: 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr "crwdns63936:0crwdne63936:0"
@@ -3827,7 +3831,7 @@ msgstr "crwdns63986:0crwdne63986:0"
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr "crwdns63990:0crwdne63990:0"
@@ -3995,7 +3999,7 @@ msgstr "crwdns152148:0crwdne152148:0"
msgid "All items have already been Invoiced/Returned"
msgstr "crwdns64038:0crwdne64038:0"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr "crwdns112194:0crwdne112194:0"
@@ -4021,7 +4025,7 @@ msgstr "crwdns152571:0crwdne152571:0"
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 "crwdns64046:0crwdne64046:0"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr "crwdns64048:0crwdne64048:0"
@@ -4907,7 +4911,7 @@ msgstr "crwdns132600:0crwdne132600:0"
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5047,7 +5051,7 @@ msgstr "crwdns132608:0crwdne132608:0"
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr "crwdns64568:0crwdne64568:0"
@@ -5198,7 +5202,7 @@ msgstr "crwdns64606:0{0}crwdnd64606:0{1}crwdnd64606:0{2}crwdnd64606:0{3}crwdnd64
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr "crwdns64608:0{0}crwdnd64608:0{1}crwdnd64608:0{2}crwdne64608:0"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr "crwdns151580:0crwdne151580:0"
@@ -5781,7 +5785,7 @@ msgstr "crwdns64862:0crwdne64862:0"
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5823,7 +5827,7 @@ msgstr "crwdns64892:0crwdne64892:0"
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr "crwdns64896:0{0}crwdnd64896:0{1}crwdne64896:0"
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr "crwdns64898:0{0}crwdnd64898:0{1}crwdne64898:0"
@@ -5862,7 +5866,7 @@ msgstr "crwdns154850:0crwdne154850:0"
msgid "Asset Finance Book"
msgstr "crwdns64910:0crwdne64910:0"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr "crwdns64912:0crwdne64912:0"
@@ -5938,7 +5942,7 @@ msgstr "crwdns64942:0{0}crwdne64942:0"
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr "crwdns64944:0crwdne64944:0"
@@ -6024,9 +6028,9 @@ msgstr "crwdns132728:0crwdne132728:0"
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr "crwdns64994:0crwdne64994:0"
@@ -6055,7 +6059,7 @@ msgstr "crwdns65008:0crwdne65008:0"
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "crwdns65010:0{0}crwdne65010:0"
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr "crwdns148762:0crwdne148762:0"
@@ -6087,7 +6091,7 @@ msgstr "crwdns65026:0{0}crwdne65026:0"
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr "crwdns65028:0{0}crwdnd65028:0{1}crwdne65028:0"
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr "crwdns65030:0crwdne65030:0"
@@ -6099,11 +6103,11 @@ msgstr "crwdns65032:0{0}crwdne65032:0"
msgid "Asset returned"
msgstr "crwdns65034:0crwdne65034:0"
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr "crwdns65036:0crwdne65036:0"
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr "crwdns65038:0{0}crwdne65038:0"
@@ -6128,7 +6132,7 @@ msgstr "crwdns65046:0{0}crwdne65046:0"
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr "crwdns154852:0{0}crwdnd154852:0{1}crwdne154852:0"
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr "crwdns65054:0{0}crwdnd65054:0{1}crwdne65054:0"
@@ -6161,7 +6165,15 @@ msgstr "crwdns65068:0{0}crwdne65068:0"
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr "crwdns155786:0{0}crwdnd155786:0{1}crwdne155786:0"
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr "crwdns157446:0{0}crwdne157446:0"
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr "crwdns157448:0{0}crwdne157448:0"
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr "crwdns65070:0{0}crwdne65070:0"
@@ -6542,7 +6554,7 @@ msgstr "crwdns65210:0crwdne65210:0"
msgid "Auto Reconcile Payments"
msgstr "crwdns132790:0crwdne132790:0"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr "crwdns65214:0crwdne65214:0"
@@ -6552,7 +6564,7 @@ msgstr "crwdns65214:0crwdne65214:0"
msgid "Auto Reconciliation Job Trigger"
msgstr "crwdns152200:0crwdne152200:0"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr "crwdns154232:0crwdne154232:0"
@@ -6727,7 +6739,7 @@ msgstr "crwdns132822:0crwdne132822:0"
msgid "Available Batch Report"
msgstr "crwdns127454:0crwdne127454:0"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr "crwdns65282:0crwdne65282:0"
@@ -6956,7 +6968,7 @@ msgstr "crwdns65358:0crwdne65358:0"
msgid "BOM 1"
msgstr "crwdns65380:0crwdne65380:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "crwdns65382:0{0}crwdnd65382:0{1}crwdne65382:0"
@@ -7194,23 +7206,23 @@ msgstr "crwdns65486:0crwdne65486:0"
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr "crwdns65488:0{0}crwdnd65488:0{1}crwdne65488:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr "crwdns65490:0{1}crwdnd65490:0{0}crwdne65490:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr "crwdns65492:0{0}crwdnd65492:0{1}crwdne65492:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr "crwdns65494:0{0}crwdne65494:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr "crwdns65496:0{0}crwdne65496:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr "crwdns132870:0{0}crwdnd132870:0{1}crwdne132870:0"
@@ -7281,7 +7293,7 @@ msgstr "crwdns65516:0crwdne65516:0"
msgid "Balance (Dr - Cr)"
msgstr "crwdns65518:0crwdne65518:0"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr "crwdns65520:0{0}crwdne65520:0"
@@ -7760,7 +7772,7 @@ msgstr "crwdns132936:0crwdne132936:0"
msgid "Base Tax Withholding Net Total"
msgstr "crwdns132938:0crwdne132938:0"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr "crwdns65752:0crwdne65752:0"
@@ -7965,7 +7977,9 @@ msgstr "crwdns65808:0crwdne65808:0"
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -7976,7 +7990,7 @@ msgstr "crwdns65810:0crwdne65810:0"
msgid "Batch No is mandatory"
msgstr "crwdns65852:0crwdne65852:0"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr "crwdns104540:0{0}crwdne104540:0"
@@ -7999,7 +8013,7 @@ msgstr "crwdns132966:0crwdne132966:0"
msgid "Batch Nos"
msgstr "crwdns65858:0crwdne65858:0"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr "crwdns65860:0crwdne65860:0"
@@ -8012,7 +8026,7 @@ msgstr "crwdns132968:0crwdne132968:0"
msgid "Batch Number Series"
msgstr "crwdns132970:0crwdne132970:0"
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr "crwdns65864:0crwdne65864:0"
@@ -8125,7 +8139,7 @@ msgstr "crwdns132986:0crwdne132986:0"
#. Label of a Card Break in the Manufacturing Workspace
#. Label of a Link in the Manufacturing Workspace
-#: erpnext/manufacturing/doctype/bom/bom.py:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8438,8 +8452,8 @@ msgstr "crwdns66050:0crwdne66050:0"
msgid "Blanket Order Rate"
msgstr "crwdns133028:0crwdne133028:0"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr "crwdns66058:0crwdne66058:0"
@@ -8555,7 +8569,7 @@ msgstr "crwdns133054:0crwdne133054:0"
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr "crwdns66106:0crwdne66106:0"
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr "crwdns66108:0{0}crwdne66108:0"
@@ -9329,7 +9343,7 @@ msgstr "crwdns66402:0crwdne66402:0"
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr "crwdns66404:0crwdne66404:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr "crwdns66406:0{0}crwdne66406:0"
@@ -9515,7 +9529,7 @@ msgstr "crwdns66524:0crwdne66524:0"
msgid "Cannot Relieve Employee"
msgstr "crwdns66526:0crwdne66526:0"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr "crwdns66528:0crwdne66528:0"
@@ -9531,6 +9545,10 @@ msgstr "crwdns66532:0crwdne66532:0"
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr "crwdns66534:0crwdne66534:0"
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr "crwdns157450:0{0}crwdnd157450:0{1}crwdne157450:0"
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr "crwdns155622:0crwdne155622:0"
@@ -9620,7 +9638,7 @@ msgstr "crwdns154638:0{0}crwdne154638:0"
msgid "Cannot create root account."
msgstr "crwdns155912:0crwdne155912:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr "crwdns66578:0crwdne66578:0"
@@ -9637,7 +9655,7 @@ msgstr "crwdns66582:0crwdne66582:0"
msgid "Cannot delete Exchange Gain/Loss row"
msgstr "crwdns151892:0crwdne151892:0"
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr "crwdns66584:0{0}crwdne66584:0"
@@ -10083,11 +10101,11 @@ msgstr "crwdns112274:0crwdne112274:0"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr "crwdns133182:0crwdne133182:0"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr "crwdns66746:0crwdne66746:0"
@@ -10100,7 +10118,7 @@ msgstr "crwdns66746:0crwdne66746:0"
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr "crwdns66748:0crwdne66748:0"
@@ -10908,6 +10926,7 @@ msgstr "crwdns133292:0crwdne133292:0"
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11055,6 +11074,7 @@ msgstr "crwdns133292:0crwdne133292:0"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11140,8 +11160,8 @@ msgstr "crwdns133292:0crwdne133292:0"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11457,7 +11477,7 @@ msgstr "crwdns133320:0crwdne133320:0"
msgid "Company and Posting Date is mandatory"
msgstr "crwdns67420:0crwdne67420:0"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr "crwdns67422:0crwdne67422:0"
@@ -12738,7 +12758,7 @@ msgstr "crwdns133466:0crwdne133466:0"
#: 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12757,7 +12777,7 @@ msgstr "crwdns133466:0crwdne133466:0"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -12970,7 +12990,7 @@ msgstr "crwdns68232:0crwdne68232:0"
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr "crwdns68234:0crwdne68234:0"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr "crwdns68238:0crwdne68238:0"
@@ -13093,15 +13113,15 @@ msgstr "crwdns68298:0crwdne68298:0"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13343,7 +13363,7 @@ msgstr "crwdns68346:0crwdne68346:0"
msgid "Create POS Opening Entry"
msgstr "crwdns68348:0crwdne68348:0"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr "crwdns68352:0crwdne68352:0"
@@ -13499,7 +13519,7 @@ msgstr "crwdns68462:0crwdne68462:0"
msgid "Creating Delivery Note ..."
msgstr "crwdns68466:0crwdne68466:0"
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr "crwdns68468:0crwdne68468:0"
@@ -13519,7 +13539,7 @@ msgstr "crwdns148770:0crwdne148770:0"
msgid "Creating Purchase Order ..."
msgstr "crwdns68472:0crwdne68472:0"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13556,11 +13576,6 @@ msgstr "crwdns68486:0crwdne68486:0"
msgid "Creation"
msgstr "crwdns68488:0crwdne68488:0"
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr "crwdns133518:0crwdne133518:0"
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr "crwdns68492:0{0}crwdnd68492:0{1}crwdne68492:0"
@@ -13593,11 +13608,11 @@ msgstr "crwdns68496:0{0}crwdne68496:0"
msgid "Credit"
msgstr "crwdns68498:0crwdne68498:0"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr "crwdns68504:0crwdne68504:0"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr "crwdns68506:0{0}crwdne68506:0"
@@ -13740,7 +13755,7 @@ msgstr "crwdns68568:0crwdne68568:0"
msgid "Credit Note will update it's own outstanding amount, even if 'Return Against' is specified."
msgstr "crwdns152202:0crwdne152202:0"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr "crwdns68574:0{0}crwdne68574:0"
@@ -13948,7 +13963,7 @@ msgstr "crwdns112294:0crwdne112294:0"
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14047,7 +14062,7 @@ msgstr "crwdns68708:0crwdne68708:0"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr "crwdns68710:0{0}crwdnd68710:0{1}crwdne68710:0"
@@ -14397,6 +14412,7 @@ msgstr "crwdns133606:0crwdne133606:0"
#: 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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14424,6 +14440,10 @@ msgstr "crwdns133610:0crwdne133610:0"
msgid "Customer / Lead Address"
msgstr "crwdns133612:0crwdne133612:0"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr "crwdns157452:0crwdne157452:0"
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14825,7 +14845,7 @@ msgstr "crwdns69084:0crwdne69084:0"
#: 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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr "crwdns69086:0{0}crwdnd69086:0{1}crwdne69086:0"
@@ -15177,7 +15197,7 @@ msgstr "crwdns133690:0crwdne133690:0"
msgid "Date of Joining"
msgstr "crwdns133692:0crwdne133692:0"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr "crwdns69270:0crwdne69270:0"
@@ -15314,11 +15334,11 @@ msgstr "crwdns69314:0crwdne69314:0"
msgid "Debit"
msgstr "crwdns69316:0crwdne69316:0"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr "crwdns69322:0crwdne69322:0"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr "crwdns69324:0{0}crwdne69324:0"
@@ -15392,7 +15412,7 @@ msgstr "crwdns133728:0crwdne133728:0"
msgid "Debit To is required"
msgstr "crwdns69352:0crwdne69352:0"
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr "crwdns69354:0{0}crwdnd69354:0#{1}crwdnd69354:0{2}crwdne69354:0"
@@ -16459,7 +16479,7 @@ msgstr "crwdns69812:0crwdne69812:0"
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16534,9 +16554,9 @@ msgstr "crwdns133948:0crwdne133948:0"
msgid "Depreciate based on shifts"
msgstr "crwdns133950:0crwdne133950:0"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr "crwdns69862:0crwdne69862:0"
@@ -16592,6 +16612,14 @@ msgstr "crwdns69884:0crwdne69884:0"
msgid "Depreciation Entry Posting Status"
msgstr "crwdns133954:0crwdne133954:0"
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr "crwdns157454:0{0}crwdne157454:0"
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr "crwdns157456:0{0}crwdnd157456:0{1}crwdne157456:0"
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16600,7 +16628,7 @@ msgstr "crwdns133954:0crwdne133954:0"
msgid "Depreciation Expense Account"
msgstr "crwdns133956:0crwdne133956:0"
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr "crwdns69896:0crwdne69896:0"
@@ -17486,6 +17514,10 @@ msgstr "crwdns134008:0crwdne134008:0"
msgid "Discount Percentage"
msgstr "crwdns134010:0crwdne134010:0"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr "crwdns157458:0crwdne157458:0"
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr "crwdns155368:0crwdne155368:0"
@@ -17718,7 +17750,7 @@ msgstr "crwdns134044:0crwdne134044:0"
msgid "Disposal Date"
msgstr "crwdns134046:0crwdne134046:0"
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr "crwdns155150:0{0}crwdnd155150:0{1}crwdnd155150:0{2}crwdne155150:0"
@@ -17998,7 +18030,7 @@ msgstr "crwdns134084:0crwdne134084:0"
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr "crwdns152208:0crwdne152208:0"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr "crwdns70552:0{0}crwdne70552:0"
@@ -19037,7 +19069,7 @@ msgstr "crwdns71054:0crwdne71054:0"
msgid "Ems(Pica)"
msgstr "crwdns112320:0crwdne112320:0"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr "crwdns71056:0crwdne71056:0"
@@ -19388,7 +19420,7 @@ msgstr "crwdns71182:0crwdne71182:0"
msgid "Enter a name for this Holiday List."
msgstr "crwdns71184:0crwdne71184:0"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr "crwdns71186:0crwdne71186:0"
@@ -19449,7 +19481,7 @@ msgstr "crwdns71210:0crwdne71210:0"
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr "crwdns71212:0crwdne71212:0"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr "crwdns71214:0{0}crwdne71214:0"
@@ -19469,7 +19501,7 @@ msgid "Entity"
msgstr "crwdns134258:0crwdne134258:0"
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19564,7 +19596,7 @@ msgstr "crwdns71264:0crwdne71264:0"
msgid "Error in party matching for Bank Transaction {0}"
msgstr "crwdns151898:0{0}crwdne151898:0"
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr "crwdns71268:0crwdne71268:0"
@@ -19614,11 +19646,9 @@ msgstr "crwdns134274:0crwdne134274:0"
msgid "Evaluation Period"
msgstr "crwdns134276:0crwdne134276:0"
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
-msgstr "crwdns134278:0crwdne134278:0"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
+msgstr "crwdns157460:0crwdne157460:0"
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
@@ -19979,7 +20009,7 @@ msgstr "crwdns134320:0crwdne134320:0"
msgid "Expense"
msgstr "crwdns71456:0crwdne71456:0"
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr "crwdns71466:0{0}crwdne71466:0"
@@ -20024,7 +20054,7 @@ msgstr "crwdns71466:0{0}crwdne71466:0"
msgid "Expense Account"
msgstr "crwdns71468:0crwdne71468:0"
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr "crwdns71496:0crwdne71496:0"
@@ -20331,7 +20361,7 @@ msgstr "crwdns134342:0crwdne134342:0"
msgid "Failure Description"
msgstr "crwdns134344:0crwdne134344:0"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr "crwdns111730:0{0}crwdne111730:0"
@@ -21007,6 +21037,10 @@ msgstr "crwdns71914:0crwdne71914:0"
msgid "Fixed Asset Register"
msgstr "crwdns71916:0crwdne71916:0"
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr "crwdns157462:0{0}crwdne157462:0"
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21137,7 +21171,7 @@ msgstr "crwdns71954:0crwdne71954:0"
msgid "For Item"
msgstr "crwdns111740:0crwdne111740:0"
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr "crwdns104576:0{0}crwdnd104576:0{1}crwdnd104576:0{2}crwdnd104576:0{3}crwdne104576:0"
@@ -22029,7 +22063,7 @@ msgstr "crwdns72308:0crwdne72308:0"
msgid "Future Payments"
msgstr "crwdns72310:0crwdne72310:0"
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr "crwdns148786:0crwdne148786:0"
@@ -22045,7 +22079,7 @@ msgstr "crwdns72314:0crwdne72314:0"
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr "crwdns72316:0crwdne72316:0"
@@ -22311,8 +22345,8 @@ msgid "Get Items"
msgstr "crwdns72404:0crwdne72404:0"
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22671,7 +22705,7 @@ msgstr "crwdns112372:0crwdne112372:0"
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22681,7 +22715,7 @@ msgstr "crwdns112372:0crwdne112372:0"
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22802,8 +22836,8 @@ msgstr "crwdns72600:0crwdne72600:0"
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr "crwdns72602:0crwdne72602:0"
@@ -23154,7 +23188,7 @@ msgstr "crwdns112382:0crwdne112382:0"
msgid "Height (cm)"
msgstr "crwdns134724:0crwdne134724:0"
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr "crwdns72754:0crwdne72754:0"
@@ -23193,7 +23227,7 @@ msgstr "crwdns134730:0crwdne134730:0"
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr "crwdns111754:0crwdne111754:0"
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr "crwdns72768:0{0}crwdne72768:0"
@@ -23289,7 +23323,7 @@ msgstr "crwdns72808:0crwdne72808:0"
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr "crwdns72810:0crwdne72810:0"
@@ -23383,6 +23417,10 @@ msgstr "crwdns72856:0crwdne72856:0"
msgid "Hours Spent"
msgstr "crwdns72858:0crwdne72858:0"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr "crwdns157464:0crwdne157464:0"
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23719,6 +23757,10 @@ msgstr "crwdns134828:0crwdne134828:0"
msgid "If more than one package of the same type (for print)"
msgstr "crwdns134830:0crwdne134830:0"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr "crwdns157466:0crwdne157466:0"
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23735,6 +23777,10 @@ msgstr "crwdns72958:0crwdne72958:0"
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr "crwdns134832:0crwdne134832:0"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr "crwdns157468:0crwdne157468:0"
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23817,6 +23863,10 @@ msgstr "crwdns72992:0crwdne72992:0"
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr "crwdns72994:0crwdne72994:0"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr "crwdns157470:0crwdne157470:0"
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr "crwdns111764:0crwdne111764:0"
@@ -23911,7 +23961,7 @@ msgstr "crwdns73020:0crwdne73020:0"
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr "crwdns155920:0crwdne155920:0"
@@ -23963,7 +24013,7 @@ msgstr "crwdns73048:0crwdne73048:0"
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr "crwdns143452:0crwdne143452:0"
@@ -24726,7 +24776,7 @@ msgstr "crwdns73436:0crwdne73436:0"
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24799,7 +24849,7 @@ msgstr "crwdns152384:0crwdne152384:0"
msgid "Incorrect Stock Value Report"
msgstr "crwdns73470:0crwdne73470:0"
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr "crwdns73472:0crwdne73472:0"
@@ -24966,13 +25016,13 @@ msgstr "crwdns134968:0crwdne134968:0"
msgid "Inspected By"
msgstr "crwdns73556:0crwdne73556:0"
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr "crwdns73560:0crwdne73560:0"
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr "crwdns73562:0crwdne73562:0"
@@ -24989,7 +25039,7 @@ msgstr "crwdns134970:0crwdne134970:0"
msgid "Inspection Required before Purchase"
msgstr "crwdns134972:0crwdne134972:0"
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr "crwdns73570:0crwdne73570:0"
@@ -25019,7 +25069,7 @@ msgstr "crwdns73578:0crwdne73578:0"
msgid "Installation Note Item"
msgstr "crwdns73582:0crwdne73582:0"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr "crwdns73584:0{0}crwdne73584:0"
@@ -25077,7 +25127,7 @@ msgstr "crwdns73608:0crwdne73608:0"
#: 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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "crwdns73610:0crwdne73610:0"
@@ -25268,7 +25318,7 @@ msgstr "crwdns73694:0crwdne73694:0"
msgid "Internal Work History"
msgstr "crwdns135024:0crwdne135024:0"
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr "crwdns73698:0crwdne73698:0"
@@ -25304,7 +25354,7 @@ msgid "Invalid Account"
msgstr "crwdns73712:0crwdne73712:0"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr "crwdns148866:0crwdne148866:0"
@@ -25332,7 +25382,7 @@ msgstr "crwdns73720:0crwdne73720:0"
msgid "Invalid Child Procedure"
msgstr "crwdns73722:0crwdne73722:0"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr "crwdns73724:0crwdne73724:0"
@@ -25390,7 +25440,7 @@ msgid "Invalid Ledger Entries"
msgstr "crwdns148796:0crwdne148796:0"
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr "crwdns73746:0crwdne73746:0"
@@ -25418,7 +25468,7 @@ msgstr "crwdns73756:0crwdne73756:0"
msgid "Invalid Priority"
msgstr "crwdns73758:0crwdne73758:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr "crwdns73760:0crwdne73760:0"
@@ -25502,8 +25552,8 @@ msgstr "crwdns157204:0crwdne157204:0"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr "crwdns73788:0{0}crwdnd73788:0{1}crwdnd73788:0{2}crwdne73788:0"
@@ -25511,7 +25561,7 @@ msgstr "crwdns73788:0{0}crwdnd73788:0{1}crwdnd73788:0{2}crwdne73788:0"
msgid "Invalid {0}"
msgstr "crwdns73790:0{0}crwdne73790:0"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr "crwdns73792:0{0}crwdne73792:0"
@@ -25721,7 +25771,7 @@ msgstr "crwdns73872:0crwdne73872:0"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26773,6 +26823,8 @@ msgstr "crwdns111786:0crwdne111786:0"
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26791,7 +26843,11 @@ msgstr "crwdns74292:0crwdne74292:0"
msgid "Item Code (Final Product)"
msgstr "crwdns74420:0crwdne74420:0"
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr "crwdns157472:0crwdne157472:0"
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr "crwdns74422:0crwdne74422:0"
@@ -27195,6 +27251,7 @@ msgstr "crwdns74534:0crwdne74534:0"
#: 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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28115,7 +28172,7 @@ msgstr "crwdns135256:0crwdne135256:0"
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr "crwdns75054:0crwdne75054:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr "crwdns75056:0{0}crwdnd75056:0{1}crwdne75056:0"
@@ -28321,7 +28378,7 @@ msgstr "crwdns157212:0crwdne157212:0"
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29037,7 +29094,7 @@ msgstr "crwdns75466:0crwdne75466:0"
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29708,7 +29765,7 @@ msgstr "crwdns75798:0crwdne75798:0"
msgid "Mandatory Depends On"
msgstr "crwdns135444:0crwdne135444:0"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr "crwdns75802:0crwdne75802:0"
@@ -29798,6 +29855,7 @@ msgstr "crwdns75834:0crwdne75834:0"
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30356,6 +30414,7 @@ msgid "Material Requested"
msgstr "crwdns135490:0crwdne135490:0"
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr "crwdns135492:0crwdne135492:0"
@@ -30711,7 +30770,7 @@ msgstr "crwdns111816:0crwdne111816:0"
msgid "Message Examples"
msgstr "crwdns135546:0crwdne135546:0"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr "crwdns76280:0crwdne76280:0"
@@ -31025,8 +31084,8 @@ msgstr "crwdns76350:0crwdne76350:0"
#: 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr "crwdns76352:0crwdne76352:0"
@@ -31044,6 +31103,10 @@ msgstr "crwdns76356:0crwdne76356:0"
msgid "Missing Default in Company"
msgstr "crwdns151906:0crwdne151906:0"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr "crwdns157474:0crwdne157474:0"
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr "crwdns76358:0crwdne76358:0"
@@ -31076,7 +31139,7 @@ msgstr "crwdns76370:0crwdne76370:0"
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr "crwdns76374:0crwdne76374:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr "crwdns76376:0crwdne76376:0"
@@ -31742,7 +31805,7 @@ msgstr "crwdns135642:0crwdne135642:0"
msgid "Needs Analysis"
msgstr "crwdns76732:0crwdne76732:0"
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr "crwdns152340:0crwdne152340:0"
@@ -32174,7 +32237,7 @@ msgstr "crwdns135680:0crwdne135680:0"
msgid "New Sales Person Name"
msgstr "crwdns76956:0crwdne76956:0"
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr "crwdns76958:0crwdne76958:0"
@@ -32210,7 +32273,7 @@ msgstr "crwdns111824:0crwdne111824:0"
msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date"
msgstr "crwdns135684:0crwdne135684:0"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr "crwdns76972:0crwdne76972:0"
@@ -32319,7 +32382,7 @@ msgstr "crwdns77022:0crwdne77022:0"
msgid "No Answer"
msgstr "crwdns135692:0crwdne135692:0"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr "crwdns77026:0{0}crwdne77026:0"
@@ -32376,9 +32439,9 @@ msgstr "crwdns77044:0crwdne77044:0"
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr "crwdns77046:0crwdne77046:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr "crwdns77048:0crwdne77048:0"
@@ -32413,7 +32476,7 @@ msgstr "crwdns77054:0crwdne77054:0"
msgid "No Summary"
msgstr "crwdns111830:0crwdne111830:0"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr "crwdns77056:0{0}crwdne77056:0"
@@ -32511,7 +32574,7 @@ msgstr "crwdns111834:0crwdne111834:0"
msgid "No items to be received are overdue"
msgstr "crwdns77098:0crwdne77098:0"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr "crwdns77100:0crwdne77100:0"
@@ -32645,11 +32708,11 @@ msgstr "crwdns135706:0crwdne135706:0"
msgid "No values"
msgstr "crwdns77150:0crwdne77150:0"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr "crwdns77152:0{0}crwdne77152:0"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr "crwdns77154:0{0}crwdne77154:0"
@@ -32684,7 +32747,7 @@ msgstr "crwdns154912:0crwdne154912:0"
msgid "Non Profit"
msgstr "crwdns77168:0crwdne77168:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr "crwdns77170:0crwdne77170:0"
@@ -32863,7 +32926,7 @@ msgstr "crwdns154914:0{0}crwdnd154914:0{1}crwdne154914:0"
msgid "Note: Email will not be sent to disabled users"
msgstr "crwdns135724:0crwdne135724:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr "crwdns154916:0{0}crwdne154916:0"
@@ -32883,7 +32946,7 @@ msgstr "crwdns77236:0crwdne77236:0"
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr "crwdns77238:0{0}crwdne77238:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr "crwdns77240:0{0}crwdne77240:0"
@@ -32899,6 +32962,7 @@ msgstr "crwdns77240:0{0}crwdne77240:0"
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33334,6 +33398,12 @@ msgstr "crwdns135808:0crwdne135808:0"
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr "crwdns111850:0{0}crwdnd111850:0{1}crwdne111850:0"
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr "crwdns157476:0crwdne157476:0"
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33535,8 +33605,8 @@ msgstr "crwdns77542:0crwdne77542:0"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr "crwdns77544:0crwdne77544:0"
@@ -33578,7 +33648,7 @@ msgstr "crwdns135830:0crwdne135830:0"
msgid "Opening Entry"
msgstr "crwdns135832:0crwdne135832:0"
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr "crwdns77568:0crwdne77568:0"
@@ -33606,7 +33676,7 @@ msgid "Opening Invoice Item"
msgstr "crwdns77578:0crwdne77578:0"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 "crwdns148804:0{0}crwdnd148804:0{1}crwdnd148804:0{2}crwdnd148804:0{3}crwdne148804:0"
@@ -33680,7 +33750,7 @@ msgstr "crwdns135838:0crwdne135838:0"
msgid "Operating Cost Per BOM Quantity"
msgstr "crwdns135840:0crwdne135840:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr "crwdns77608:0crwdne77608:0"
@@ -33836,7 +33906,7 @@ msgstr "crwdns77670:0crwdne77670:0"
msgid "Operations Routing"
msgstr "crwdns149098:0crwdne149098:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr "crwdns77678:0crwdne77678:0"
@@ -34428,7 +34498,7 @@ msgstr "crwdns135916:0crwdne135916:0"
msgid "Over Picking Allowance"
msgstr "crwdns142960:0crwdne142960:0"
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr "crwdns77934:0crwdne77934:0"
@@ -34880,7 +34950,7 @@ msgstr "crwdns78136:0crwdne78136:0"
msgid "Packed Items"
msgstr "crwdns135958:0crwdne135958:0"
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr "crwdns78146:0crwdne78146:0"
@@ -34915,7 +34985,7 @@ msgstr "crwdns78160:0crwdne78160:0"
msgid "Packing Slip Item"
msgstr "crwdns78164:0crwdne78164:0"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr "crwdns78166:0crwdne78166:0"
@@ -35001,7 +35071,7 @@ msgstr "crwdns78204:0crwdne78204:0"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35276,7 +35346,7 @@ msgstr "crwdns136036:0crwdne136036:0"
msgid "Partial Payment in POS Transactions are not allowed."
msgstr "crwdns154654:0crwdne154654:0"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr "crwdns78344:0crwdne78344:0"
@@ -35470,9 +35540,9 @@ msgstr "crwdns112550:0crwdne112550:0"
#: 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35633,9 +35703,9 @@ msgstr "crwdns78486:0crwdne78486:0"
#: 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35800,7 +35870,7 @@ msgstr "crwdns136100:0crwdne136100:0"
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -35936,7 +36006,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr "crwdns78642:0crwdne78642:0"
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr "crwdns78644:0crwdne78644:0"
@@ -36145,7 +36215,7 @@ msgstr "crwdns136134:0crwdne136134:0"
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36171,11 +36241,11 @@ msgstr "crwdns136136:0crwdne136136:0"
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr "crwdns143196:0crwdne143196:0"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr "crwdns78742:0{0}crwdne78742:0"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr "crwdns148872:0crwdne148872:0"
@@ -36333,7 +36403,7 @@ msgstr "crwdns148816:0crwdne148816:0"
msgid "Payment Unlink Error"
msgstr "crwdns78822:0crwdne78822:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr "crwdns78824:0{0}crwdnd78824:0{1}crwdnd78824:0{2}crwdne78824:0"
@@ -36654,7 +36724,7 @@ msgstr "crwdns78952:0crwdne78952:0"
msgid "Period Based On"
msgstr "crwdns78954:0crwdne78954:0"
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr "crwdns78956:0crwdne78956:0"
@@ -37257,7 +37327,7 @@ msgstr "crwdns79202:0crwdne79202:0"
msgid "Please add {1} role to user {0}."
msgstr "crwdns79204:0{1}crwdnd79204:0{0}crwdne79204:0"
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr "crwdns79206:0{0}crwdne79206:0"
@@ -37265,7 +37335,7 @@ msgstr "crwdns79206:0{0}crwdne79206:0"
msgid "Please attach CSV file"
msgstr "crwdns79208:0crwdne79208:0"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr "crwdns79210:0crwdne79210:0"
@@ -37278,7 +37348,7 @@ msgstr "crwdns79212:0crwdne79212:0"
msgid "Please cancel related transaction."
msgstr "crwdns79214:0crwdne79214:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr "crwdns79216:0crwdne79216:0"
@@ -37355,7 +37425,7 @@ msgstr "crwdns79252:0{0}crwdne79252:0"
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr "crwdns79254:0{0}crwdnd79254:0{1}crwdnd79254:0{2}crwdne79254:0"
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr "crwdns154920:0{0}crwdne154920:0"
@@ -37479,7 +37549,7 @@ msgstr "crwdns79306:0crwdne79306:0"
msgid "Please enter Receipt Document"
msgstr "crwdns79308:0crwdne79308:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr "crwdns79310:0crwdne79310:0"
@@ -37604,8 +37674,8 @@ msgstr "crwdns79370:0crwdne79370:0"
msgid "Please mention 'Weight UOM' along with Weight."
msgstr "crwdns79372:0crwdne79372:0"
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr "crwdns148818:0{0}crwdnd148818:0{1}crwdne148818:0"
@@ -37733,7 +37803,7 @@ msgstr "crwdns79426:0crwdne79426:0"
msgid "Please select Posting Date first"
msgstr "crwdns79428:0crwdne79428:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr "crwdns79430:0crwdne79430:0"
@@ -37765,7 +37835,7 @@ msgstr "crwdns79440:0{0}crwdne79440:0"
msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
msgstr "crwdns79442:0{0}crwdne79442:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr "crwdns79444:0crwdne79444:0"
@@ -37855,6 +37925,10 @@ msgstr "crwdns79480:0{0}crwdnd79480:0{1}crwdne79480:0"
msgid "Please select an item code before setting the warehouse."
msgstr "crwdns142838:0crwdne142838:0"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:26
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr "crwdns157478:0crwdne157478:0"
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr "crwdns155386:0crwdne155386:0"
@@ -37863,7 +37937,7 @@ msgstr "crwdns155386:0crwdne155386:0"
msgid "Please select atleast one operation to create Job Card"
msgstr "crwdns157216:0crwdne157216:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr "crwdns79482:0crwdne79482:0"
@@ -37944,15 +38018,15 @@ msgstr "crwdns79510:0{0}crwdne79510:0"
msgid "Please set 'Apply Additional Discount On'"
msgstr "crwdns79512:0crwdne79512:0"
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr "crwdns79514:0{0}crwdne79514:0"
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr "crwdns79516:0{0}crwdne79516:0"
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr "crwdns148820:0{0}crwdnd148820:0{1}crwdne148820:0"
@@ -37960,7 +38034,7 @@ msgstr "crwdns148820:0{0}crwdnd148820:0{1}crwdne148820:0"
msgid "Please set Account"
msgstr "crwdns79518:0crwdne79518:0"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr "crwdns111902:0crwdne111902:0"
@@ -37986,7 +38060,7 @@ msgstr "crwdns79522:0crwdne79522:0"
msgid "Please set Company"
msgstr "crwdns79524:0crwdne79524:0"
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr "crwdns79526:0{0}crwdnd79526:0{1}crwdne79526:0"
@@ -38004,7 +38078,7 @@ msgstr "crwdns79530:0%scrwdne79530:0"
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr "crwdns79532:0%scrwdne79532:0"
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr "crwdns154922:0{0}crwdne154922:0"
@@ -38067,7 +38141,7 @@ msgstr "crwdns79558:0{0}crwdne79558:0"
msgid "Please set an Address on the Company '%s'"
msgstr "crwdns79560:0%scrwdne79560:0"
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr "crwdns79562:0crwdne79562:0"
@@ -38083,23 +38157,23 @@ msgstr "crwdns79566:0crwdne79566:0"
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr "crwdns154248:0{0}crwdne154248:0"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr "crwdns79568:0{0}crwdne79568:0"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr "crwdns79570:0crwdne79570:0"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "crwdns79572:0crwdne79572:0"
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr "crwdns79574:0crwdne79574:0"
@@ -38203,7 +38277,7 @@ msgstr "crwdns151138:0{0}crwdnd151138:0{1}crwdnd151138:0{2}crwdne151138:0"
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr "crwdns111904:0{0}crwdnd111904:0{1}crwdne111904:0"
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr "crwdns79616:0crwdne79616:0"
@@ -38216,7 +38290,7 @@ msgid "Please specify Company"
msgstr "crwdns79620:0crwdne79620:0"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr "crwdns79622:0crwdne79622:0"
@@ -38389,6 +38463,7 @@ msgstr "crwdns79678:0crwdne79678:0"
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38423,11 +38498,11 @@ msgstr "crwdns79678:0crwdne79678:0"
#: 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38446,6 +38521,7 @@ msgstr "crwdns79678:0crwdne79678:0"
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38455,6 +38531,7 @@ msgstr "crwdns79678:0crwdne79678:0"
#: 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_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
@@ -39020,6 +39097,14 @@ msgstr "crwdns80010:0crwdne80010:0"
msgid "Pricing Rule Item Group"
msgstr "crwdns80014:0crwdne80014:0"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr "crwdns157480:0crwdne157480:0"
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr "crwdns157482:0crwdne157482:0"
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr "crwdns80018:0{0}crwdne80018:0"
@@ -39078,6 +39163,10 @@ msgstr "crwdns80018:0{0}crwdne80018:0"
msgid "Pricing Rules"
msgstr "crwdns136326:0crwdne136326:0"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr "crwdns157484:0crwdne157484:0"
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39465,7 +39554,7 @@ msgstr "crwdns136366:0crwdne136366:0"
msgid "Process Loss"
msgstr "crwdns136368:0crwdne136368:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr "crwdns80274:0crwdne80274:0"
@@ -39955,7 +40044,7 @@ msgstr "crwdns80480:0crwdne80480:0"
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40430,7 +40519,7 @@ msgstr "crwdns80754:0crwdne80754:0"
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr "crwdns80756:0crwdne80756:0"
@@ -40586,7 +40675,7 @@ msgstr "crwdns80810:0crwdne80810:0"
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40762,9 +40851,9 @@ msgstr "crwdns80900:0crwdne80900:0"
#. 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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41645,6 +41734,7 @@ msgstr "crwdns81312:0crwdne81312:0"
#: 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/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
@@ -41761,7 +41851,7 @@ msgstr "crwdns81398:0{0}crwdne81398:0"
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr "crwdns136506:0crwdne136506:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr "crwdns81402:0{0}crwdnd81402:0{1}crwdne81402:0"
@@ -42610,7 +42700,7 @@ msgid "Reason"
msgstr "crwdns81836:0crwdne81836:0"
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "crwdns81838:0crwdne81838:0"
@@ -43046,7 +43136,7 @@ msgstr "crwdns136680:0crwdne136680:0"
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr "crwdns82004:0crwdne82004:0"
@@ -43178,7 +43268,7 @@ msgstr "crwdns82028:0crwdne82028:0"
msgid "Reference"
msgstr "crwdns82030:0crwdne82030:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr "crwdns82078:0#{0}crwdnd82078:0{1}crwdne82078:0"
@@ -43316,7 +43406,7 @@ msgstr "crwdns82118:0crwdne82118:0"
msgid "Reference No"
msgstr "crwdns136710:0crwdne136710:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr "crwdns82150:0{0}crwdne82150:0"
@@ -43324,11 +43414,11 @@ msgstr "crwdns82150:0{0}crwdne82150:0"
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr "crwdns82152:0crwdne82152:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr "crwdns82154:0crwdne82154:0"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr "crwdns82156:0crwdne82156:0"
@@ -43442,11 +43532,11 @@ msgstr "crwdns82202:0{0}crwdnd82202:0{1}crwdnd82202:0{2}crwdne82202:0"
msgid "References"
msgstr "crwdns82204:0crwdne82204:0"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr "crwdns111936:0crwdne111936:0"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr "crwdns111938:0crwdne111938:0"
@@ -43591,8 +43681,8 @@ msgstr "crwdns136746:0crwdne136746:0"
#. 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43611,7 +43701,7 @@ msgstr "crwdns136748:0crwdne136748:0"
msgid "Remaining"
msgstr "crwdns82288:0crwdne82288:0"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr "crwdns154926:0crwdne154926:0"
@@ -43624,7 +43714,7 @@ msgstr "crwdns82290:0crwdne82290:0"
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr "crwdns82292:0crwdne82292:0"
@@ -43673,7 +43763,7 @@ msgstr "crwdns82292:0crwdne82292:0"
#: 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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -43984,7 +44074,7 @@ msgstr "crwdns82438:0crwdne82438:0"
msgid "Repost Status"
msgstr "crwdns136788:0crwdne136788:0"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr "crwdns82446:0crwdne82446:0"
@@ -44308,7 +44398,7 @@ msgstr "crwdns136816:0crwdne136816:0"
msgid "Reseller"
msgstr "crwdns143514:0crwdne143514:0"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr "crwdns82598:0crwdne82598:0"
@@ -44777,7 +44867,7 @@ msgstr "crwdns82772:0crwdne82772:0"
msgid "Return / Credit Note"
msgstr "crwdns82782:0crwdne82782:0"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr "crwdns82784:0crwdne82784:0"
@@ -45301,12 +45391,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr "crwdns156066:0{0}crwdne156066:0"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1919
msgid "Row #{0} (Payment Table): Amount must be negative"
msgstr "crwdns83042:0#{0}crwdne83042:0"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:515
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "crwdns83044:0#{0}crwdne83044:0"
@@ -45452,7 +45542,7 @@ msgstr "crwdns83112:0#{0}crwdnd83112:0{1}crwdnd83112:0{2}crwdne83112:0"
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr "crwdns83114:0#{0}crwdne83114:0"
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr "crwdns83116:0#{0}crwdnd83116:0{1}crwdnd83116:0{2}crwdne83116:0"
@@ -45476,11 +45566,11 @@ msgstr "crwdns136954:0#{0}crwdnd136954:0{1}crwdne136954:0"
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr "crwdns83124:0#{0}crwdnd83124:0{1}crwdne83124:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr "crwdns83126:0#{0}crwdnd83126:0{1}crwdne83126:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr "crwdns83128:0#{0}crwdnd83128:0{1}crwdne83128:0"
@@ -45500,7 +45590,7 @@ msgstr "crwdns83132:0#{0}crwdne83132:0"
msgid "Row #{0}: Item {1} does not exist"
msgstr "crwdns83134:0#{0}crwdnd83134:0{1}crwdne83134:0"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr "crwdns83136:0#{0}crwdnd83136:0{1}crwdne83136:0"
@@ -45536,7 +45626,7 @@ msgstr "crwdns154960:0#{0}crwdne154960:0"
msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
msgstr "crwdns83148:0#{0}crwdne83148:0"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr "crwdns83150:0#{0}crwdnd83150:0{1}crwdnd83150:0{2}crwdne83150:0"
@@ -45581,15 +45671,15 @@ msgstr "crwdns83168:0#{0}crwdne83168:0"
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 "crwdns83170:0#{0}crwdnd83170:0{1}crwdnd83170:0{2}crwdnd83170:0{3}crwdnd83170:0{4}crwdne83170:0"
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr "crwdns151832:0#{0}crwdnd151832:0{1}crwdne151832:0"
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr "crwdns151834:0#{0}crwdnd151834:0{1}crwdnd151834:0{2}crwdne151834:0"
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr "crwdns151836:0#{0}crwdnd151836:0{1}crwdnd151836:0{2}crwdne151836:0"
@@ -45598,7 +45688,7 @@ msgstr "crwdns151836:0#{0}crwdnd151836:0{1}crwdnd151836:0{2}crwdne151836:0"
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "crwdns83172:0#{0}crwdnd83172:0{1}crwdne83172:0"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr "crwdns83174:0#{0}crwdnd83174:0{1}crwdne83174:0"
@@ -45692,19 +45782,19 @@ msgstr "crwdns83212:0#{0}crwdnd83212:0{1}crwdnd83212:0{2}crwdne83212:0"
msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}."
msgstr "crwdns83214:0#{0}crwdnd83214:0{1}crwdnd83214:0{2}crwdne83214:0"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr "crwdns83216:0#{0}crwdnd83216:0{1}crwdne83216:0"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr "crwdns83218:0#{0}crwdnd83218:0{1}crwdne83218:0"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr "crwdns83220:0#{0}crwdnd83220:0{1}crwdne83220:0"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr "crwdns83222:0#{0}crwdnd83222:0{1}crwdnd83222:0{2}crwdne83222:0"
@@ -45712,8 +45802,8 @@ msgstr "crwdns83222:0#{0}crwdnd83222:0{1}crwdnd83222:0{2}crwdne83222:0"
msgid "Row #{0}: Stock not available to reserve for Item {1} against Batch {2} in Warehouse {3}."
msgstr "crwdns83224:0#{0}crwdnd83224:0{1}crwdnd83224:0{2}crwdnd83224:0{3}crwdne83224:0"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr "crwdns83226:0#{0}crwdnd83226:0{1}crwdnd83226:0{2}crwdne83226:0"
@@ -45894,7 +45984,7 @@ msgstr "crwdns83292:0{0}crwdnd83292:0{1}crwdnd83292:0{2}crwdnd83292:0{3}crwdne83
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr "crwdns83294:0{0}crwdne83294:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr "crwdns83296:0{0}crwdnd83296:0{1}crwdnd83296:0{2}crwdne83296:0"
@@ -45902,11 +45992,11 @@ msgstr "crwdns83296:0{0}crwdnd83296:0{1}crwdnd83296:0{2}crwdne83296:0"
msgid "Row {0}: Activity Type is mandatory."
msgstr "crwdns83300:0{0}crwdne83300:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr "crwdns83302:0{0}crwdne83302:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr "crwdns83304:0{0}crwdne83304:0"
@@ -45926,7 +46016,7 @@ msgstr "crwdns111976:0{0}crwdnd111976:0{1}crwdnd111976:0{2}crwdnd111976:0{3}crwd
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr "crwdns83310:0{0}crwdnd83310:0{1}crwdne83310:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr "crwdns83312:0{0}crwdne83312:0"
@@ -45942,7 +46032,7 @@ msgstr "crwdns83316:0{0}crwdnd83316:0{1}crwdnd83316:0{2}crwdne83316:0"
msgid "Row {0}: Cost center is required for an item {1}"
msgstr "crwdns83318:0{0}crwdnd83318:0{1}crwdne83318:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr "crwdns83320:0{0}crwdnd83320:0{1}crwdne83320:0"
@@ -45950,7 +46040,7 @@ msgstr "crwdns83320:0{0}crwdnd83320:0{1}crwdne83320:0"
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr "crwdns83322:0{0}crwdnd83322:0#{1}crwdnd83322:0{2}crwdne83322:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr "crwdns83324:0{0}crwdnd83324:0{1}crwdne83324:0"
@@ -45966,7 +46056,7 @@ msgstr "crwdns83330:0{0}crwdne83330:0"
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr "crwdns83332:0{0}crwdne83332:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "crwdns83336:0{0}crwdne83336:0"
@@ -46000,7 +46090,7 @@ msgstr "crwdns83348:0{0}crwdne83348:0"
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr "crwdns83350:0{0}crwdnd83350:0{1}crwdnd83350:0{2}crwdne83350:0"
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr "crwdns83352:0{0}crwdne83352:0"
@@ -46012,7 +46102,7 @@ msgstr "crwdns83354:0{0}crwdne83354:0"
msgid "Row {0}: Hours value must be greater than zero."
msgstr "crwdns83356:0{0}crwdne83356:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr "crwdns83358:0{0}crwdnd83358:0{1}crwdne83358:0"
@@ -46036,7 +46126,7 @@ msgstr "crwdns83366:0{0}crwdnd83366:0{1}crwdne83366:0"
msgid "Row {0}: Item {1}'s quantity cannot be higher than the available quantity."
msgstr "crwdns151960:0{0}crwdnd151960:0{1}crwdne151960:0"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr "crwdns83368:0{0}crwdnd83368:0{1}crwdne83368:0"
@@ -46044,7 +46134,7 @@ msgstr "crwdns83368:0{0}crwdnd83368:0{1}crwdne83368:0"
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr "crwdns83370:0{0}crwdnd83370:0{1}crwdne83370:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr "crwdns83372:0{0}crwdnd83372:0{1}crwdnd83372:0{2}crwdnd83372:0{3}crwdnd83372:0{4}crwdne83372:0"
@@ -46056,11 +46146,11 @@ msgstr "crwdns83374:0{0}crwdnd83374:0{1}crwdne83374:0"
msgid "Row {0}: Payment Term is mandatory"
msgstr "crwdns83376:0{0}crwdne83376:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr "crwdns83378:0{0}crwdne83378:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr "crwdns83380:0{0}crwdnd83380:0{1}crwdne83380:0"
@@ -46128,7 +46218,7 @@ msgstr "crwdns83408:0{0}crwdne83408:0"
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr "crwdns83410:0{0}crwdnd83410:0{1}crwdne83410:0"
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr "crwdns83412:0{0}crwdne83412:0"
@@ -46152,7 +46242,7 @@ msgstr "crwdns83416:0{0}crwdnd83416:0{1}crwdnd83416:0{2}crwdne83416:0"
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "crwdns83420:0{0}crwdne83420:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr "crwdns151454:0{0}crwdnd151454:0{1}crwdne151454:0"
@@ -46173,7 +46263,7 @@ msgstr "crwdns83426:0{0}crwdnd83426:0{1}crwdne83426:0"
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr "crwdns83428:0{0}crwdnd83428:0{1}crwdnd83428:0{2}crwdnd83428:0{3}crwdnd83428:0{4}crwdne83428:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr "crwdns83430:0{0}crwdnd83430:0{1}crwdnd83430:0{2}crwdnd83430:0{3}crwdne83430:0"
@@ -46566,7 +46656,7 @@ msgstr "crwdns154674:0crwdne154674:0"
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr "crwdns154676:0crwdne154676:0"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr "crwdns83606:0{0}crwdne83606:0"
@@ -46795,7 +46885,7 @@ msgstr "crwdns136996:0crwdne136996:0"
msgid "Sales Order Trends"
msgstr "crwdns83690:0crwdne83690:0"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr "crwdns83692:0{0}crwdne83692:0"
@@ -47305,8 +47395,8 @@ msgstr "crwdns137024:0crwdne137024:0"
#: 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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47577,7 +47667,7 @@ msgstr "crwdns137072:0crwdne137072:0"
msgid "Scrap Warehouse"
msgstr "crwdns137074:0crwdne137074:0"
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr "crwdns148832:0crwdne148832:0"
@@ -47650,7 +47740,7 @@ msgstr "crwdns143524:0crwdne143524:0"
msgid "Section"
msgstr "crwdns148628:0crwdne148628:0"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr "crwdns84068:0crwdne84068:0"
@@ -48020,7 +48110,7 @@ msgstr "crwdns137100:0crwdne137100:0"
msgid "Selected POS Opening Entry should be open."
msgstr "crwdns84222:0crwdne84222:0"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr "crwdns84224:0crwdne84224:0"
@@ -48204,7 +48294,7 @@ msgstr "crwdns137126:0crwdne137126:0"
msgid "Sender"
msgstr "crwdns137128:0crwdne137128:0"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr "crwdns84304:0crwdne84304:0"
@@ -48328,7 +48418,9 @@ msgstr "crwdns84330:0crwdne84330:0"
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48359,7 +48451,9 @@ msgid "Serial No Count"
msgstr "crwdns84382:0crwdne84382:0"
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr "crwdns84384:0crwdne84384:0"
@@ -48367,7 +48461,7 @@ msgstr "crwdns84384:0crwdne84384:0"
msgid "Serial No Range"
msgstr "crwdns149104:0crwdne149104:0"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr "crwdns152348:0crwdne152348:0"
@@ -48407,6 +48501,13 @@ msgstr "crwdns84392:0crwdne84392:0"
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr "crwdns137146:0crwdne137146:0"
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr "crwdns157486:0crwdne157486:0"
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr "crwdns84400:0crwdne84400:0"
@@ -48436,7 +48537,7 @@ msgstr "crwdns84410:0{0}crwdnd84410:0{1}crwdne84410:0"
msgid "Serial No {0} does not exist"
msgstr "crwdns84412:0{0}crwdne84412:0"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr "crwdns104656:0{0}crwdne104656:0"
@@ -48485,7 +48586,7 @@ msgstr "crwdns84428:0crwdne84428:0"
msgid "Serial Nos and Batches"
msgstr "crwdns137150:0crwdne137150:0"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr "crwdns84434:0crwdne84434:0"
@@ -48563,11 +48664,11 @@ msgstr "crwdns137154:0crwdne137154:0"
msgid "Serial and Batch Bundle"
msgstr "crwdns84444:0crwdne84444:0"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr "crwdns84476:0crwdne84476:0"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr "crwdns84478:0crwdne84478:0"
@@ -49001,7 +49102,7 @@ msgstr "crwdns137218:0crwdne137218:0"
msgid "Set Loyalty Program"
msgstr "crwdns84712:0crwdne84712:0"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr "crwdns84716:0crwdne84716:0"
@@ -49256,7 +49357,7 @@ msgstr "crwdns137258:0crwdne137258:0"
msgid "Setting up company"
msgstr "crwdns84818:0crwdne84818:0"
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr "crwdns155928:0{0}crwdne155928:0"
@@ -49440,7 +49541,7 @@ msgstr "crwdns137274:0crwdne137274:0"
msgid "Shipment details"
msgstr "crwdns137276:0crwdne137276:0"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr "crwdns84896:0crwdne84896:0"
@@ -49687,6 +49788,10 @@ msgstr "crwdns85012:0crwdne85012:0"
msgid "Show Completed"
msgstr "crwdns85014:0crwdne85014:0"
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr "crwdns157488:0crwdne157488:0"
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr "crwdns85016:0crwdne85016:0"
@@ -49802,7 +49907,7 @@ msgstr "crwdns85054:0crwdne85054:0"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr "crwdns85056:0crwdne85056:0"
@@ -50107,13 +50212,27 @@ msgstr "crwdns85162:0crwdne85162:0"
msgid "Source DocType"
msgstr "crwdns137378:0crwdne137378:0"
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr "crwdns157490:0crwdne157490:0"
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr "crwdns137380:0crwdne137380:0"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr "crwdns157492:0crwdne157492:0"
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr "crwdns137382:0crwdne137382:0"
@@ -50184,7 +50303,7 @@ msgstr "crwdns137394:0crwdne137394:0"
msgid "Source Warehouse Address Link"
msgstr "crwdns143534:0crwdne143534:0"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr "crwdns152350:0{0}crwdne152350:0"
@@ -50695,7 +50814,7 @@ msgstr "crwdns155670:0crwdne155670:0"
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51038,7 +51157,7 @@ msgstr "crwdns85594:0{0}crwdne85594:0"
msgid "Stock Entry {0} has created"
msgstr "crwdns137448:0{0}crwdne137448:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr "crwdns85596:0{0}crwdne85596:0"
@@ -51261,13 +51380,13 @@ msgstr "crwdns85662:0crwdne85662:0"
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51276,13 +51395,13 @@ msgstr "crwdns85662:0crwdne85662:0"
msgid "Stock Reservation"
msgstr "crwdns85664:0crwdne85664:0"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr "crwdns85668:0crwdne85668:0"
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr "crwdns85670:0crwdne85670:0"
@@ -51304,7 +51423,7 @@ msgstr "crwdns85674:0crwdne85674:0"
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 "crwdns85676:0crwdne85676:0"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr "crwdns85678:0crwdne85678:0"
@@ -51549,7 +51668,7 @@ msgstr "crwdns137466:0crwdne137466:0"
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr "crwdns85782:0{0}crwdne85782:0"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr "crwdns85784:0{0}crwdne85784:0"
@@ -51565,7 +51684,7 @@ msgstr "crwdns112036:0{0}crwdne112036: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 "crwdns112038:0crwdne112038:0"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr "crwdns152358:0{0}crwdne152358:0"
@@ -52433,10 +52552,15 @@ msgstr "crwdns86128:0crwdne86128:0"
#: 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "crwdns86134:0crwdne86134:0"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr "crwdns157494:0crwdne157494:0"
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52549,7 +52673,7 @@ msgstr "crwdns137550:0crwdne137550:0"
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr "crwdns86258:0crwdne86258:0"
@@ -52563,8 +52687,8 @@ msgstr "crwdns86262:0crwdne86262:0"
#: 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "crwdns86264:0crwdne86264:0"
@@ -53111,16 +53235,16 @@ msgstr "crwdns86438:0{0}crwdnd86438:0{1}crwdne86438:0"
msgid "System will notify to increase or decrease quantity or amount "
msgstr "crwdns137594:0crwdne137594:0"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr "crwdns112046:0crwdne112046:0"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr "crwdns86442:0crwdne86442:0"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr "crwdns112048:0crwdne112048:0"
@@ -53137,7 +53261,7 @@ msgstr "crwdns151582:0crwdne151582:0"
msgid "TDS Payable"
msgstr "crwdns86446:0crwdne86446:0"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr "crwdns86448:0crwdne86448:0"
@@ -53693,7 +53817,7 @@ msgstr "crwdns137668:0crwdne137668:0"
msgid "Tax Withheld Vouchers"
msgstr "crwdns86746:0crwdne86746:0"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr "crwdns143544:0crwdne143544:0"
@@ -54318,7 +54442,7 @@ msgstr "crwdns87056:0crwdne87056:0"
msgid "The BOM which will be replaced"
msgstr "crwdns137726:0crwdne137726:0"
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr "crwdns152362:0{0}crwdnd152362:0{1}crwdnd152362:0{2}crwdne152362:0"
@@ -54346,7 +54470,7 @@ msgstr "crwdns87074:0crwdne87074:0"
msgid "The Loyalty Program isn't valid for the selected company"
msgstr "crwdns87078:0crwdne87078:0"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr "crwdns87080:0{0}crwdne87080:0"
@@ -54370,7 +54494,7 @@ msgstr "crwdns152328:0{0}crwdne152328:0"
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr "crwdns142842:0#{0}crwdnd142842:0{1}crwdnd142842:0{2}crwdne142842:0"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr "crwdns152364:0{0}crwdnd152364:0{1}crwdnd152364:0{2}crwdne152364:0"
@@ -54392,7 +54516,7 @@ msgstr "crwdns148634:0crwdne148634:0"
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr "crwdns137728:0crwdne137728:0"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr "crwdns148882:0{0}crwdne148882:0"
@@ -54433,7 +54557,7 @@ msgstr "crwdns87110:0crwdne87110:0"
msgid "The field To Shareholder cannot be blank"
msgstr "crwdns87112:0crwdne87112:0"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr "crwdns148838:0{0}crwdnd148838:0{1}crwdne148838:0"
@@ -54449,7 +54573,7 @@ msgstr "crwdns87116:0crwdne87116:0"
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr "crwdns87118:0crwdne87118:0"
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr "crwdns87120:0{0}crwdne87120:0"
@@ -54710,6 +54834,10 @@ msgstr "crwdns156074:0{0}crwdnd156074:0{1}crwdnd156074:0{0}crwdnd156074:0{2}crwd
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr "crwdns87210:0{0}crwdnd87210:0{1}crwdnd87210:0{2}crwdne87210:0"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc."
+msgstr "crwdns157496:0crwdne157496:0"
+
#: erpnext/assets/doctype/asset/asset.py:579
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr "crwdns87212:0crwdne87212:0"
@@ -54976,7 +55104,7 @@ msgstr "crwdns154988:0{0}crwdnd154988:0{1}crwdne154988:0"
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr "crwdns87336:0{0}crwdnd87336:0{1}crwdne87336:0"
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr "crwdns87338:0{0}crwdne87338:0"
@@ -54984,7 +55112,7 @@ msgstr "crwdns87338:0{0}crwdne87338:0"
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr "crwdns87340:0{0}crwdnd87340:0{1}crwdne87340:0"
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr "crwdns87342:0{0}crwdne87342:0"
@@ -55759,6 +55887,10 @@ msgstr "crwdns87724:0{0}crwdnd87724:0{1}crwdne87724:0"
msgid "To merge, following properties must be same for both items"
msgstr "crwdns87726:0crwdne87726:0"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr "crwdns157498:0crwdne157498:0"
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr "crwdns87728:0{0}crwdnd87728:0{1}crwdne87728:0"
@@ -55776,7 +55908,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr "crwdns87734:0{0}crwdnd87734:0{1}crwdnd87734:0{2}crwdne87734:0"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr "crwdns87736:0crwdne87736:0"
@@ -55998,7 +56130,7 @@ msgstr "crwdns137850:0crwdne137850:0"
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56160,7 +56292,7 @@ msgstr "crwdns87912:0crwdne87912:0"
msgid "Total Debit"
msgstr "crwdns137888:0crwdne137888:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr "crwdns87916:0{0}crwdne87916:0"
@@ -56753,6 +56885,10 @@ msgstr "crwdns88172:0crwdne88172:0"
msgid "Traceability"
msgstr "crwdns88196:0crwdne88196:0"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr "crwdns157500:0crwdne157500:0"
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56793,7 +56929,7 @@ msgstr "crwdns137962:0crwdne137962:0"
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -56891,7 +57027,7 @@ msgstr "crwdns137972:0crwdne137972:0"
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr "crwdns88252:0crwdne88252:0"
@@ -56913,7 +57049,7 @@ msgstr "crwdns88260:0{0}crwdnd88260:0{1}crwdne88260:0"
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57510,7 +57646,11 @@ msgstr "crwdns88574:0crwdne88574:0"
msgid "Unassigned Qty"
msgstr "crwdns88580:0crwdne88580:0"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr "crwdns157502:0crwdne157502:0"
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr "crwdns88582:0crwdne88582:0"
@@ -58877,7 +59017,7 @@ msgstr "crwdns157234:0crwdne157234:0"
msgid "Vendor Invoices"
msgstr "crwdns157236:0crwdne157236:0"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr "crwdns89132:0crwdne89132:0"
@@ -58944,7 +59084,7 @@ msgstr "crwdns89146:0crwdne89146:0"
#: 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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59135,11 +59275,11 @@ msgstr "crwdns138236:0crwdne138236:0"
#: 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59174,7 +59314,7 @@ msgstr "crwdns89226:0crwdne89226:0"
#. 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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr "crwdns89230:0crwdne89230:0"
@@ -59206,9 +59346,9 @@ msgstr "crwdns89230:0crwdne89230:0"
#: 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59227,6 +59367,7 @@ msgstr "crwdns89230:0crwdne89230:0"
#: 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_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
@@ -59436,6 +59577,7 @@ msgstr "crwdns143564:0crwdne143564:0"
#: 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_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
@@ -59544,7 +59686,7 @@ msgstr "crwdns138258:0crwdne138258:0"
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr "crwdns89396:0crwdne89396:0"
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr "crwdns89398:0crwdne89398:0"
@@ -59557,7 +59699,7 @@ msgid "Warehouse not found against the account {0}"
msgstr "crwdns89402:0{0}crwdne89402:0"
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr "crwdns89406:0{0}crwdne89406:0"
@@ -59708,7 +59850,7 @@ msgstr "crwdns143566:0crwdne143566:0"
msgid "Warning!"
msgstr "crwdns89462:0crwdne89462:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr "crwdns89464:0{0}crwdnd89464:0{1}crwdnd89464:0{2}crwdne89464:0"
@@ -60191,6 +60333,7 @@ msgstr "crwdns89686:0crwdne89686:0"
#: 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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "crwdns89688:0crwdne89688:0"
@@ -60666,7 +60809,7 @@ msgstr "crwdns151712:0crwdne151712:0"
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr "crwdns89926:0crwdne89926:0"
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr "crwdns89928:0{0}crwdne89928:0"
@@ -60698,7 +60841,7 @@ msgstr "crwdns89940:0crwdne89940:0"
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr "crwdns89942:0crwdne89942:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr "crwdns89946:0crwdne89946:0"
@@ -60715,7 +60858,7 @@ msgstr "crwdns89950:0{0}crwdne89950:0"
msgid "You can only select one mode of payment as default"
msgstr "crwdns89952:0crwdne89952:0"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr "crwdns89954:0{0}crwdne89954:0"
@@ -60747,11 +60890,11 @@ msgstr "crwdns89966:0{0}crwdnd89966:0{1}crwdne89966:0"
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr "crwdns89968:0{0}crwdne89968:0"
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr "crwdns89970:0crwdne89970:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr "crwdns89972:0crwdne89972:0"
@@ -60767,7 +60910,7 @@ msgstr "crwdns89976:0crwdne89976:0"
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr "crwdns155682:0{0}crwdnd155682:0{1}crwdne155682:0"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr "crwdns89978:0{0}crwdne89978:0"
@@ -60799,7 +60942,7 @@ msgstr "crwdns89988:0crwdne89988:0"
msgid "You don't have enough Loyalty Points to redeem"
msgstr "crwdns89990:0crwdne89990:0"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr "crwdns89992:0crwdne89992:0"
@@ -61225,7 +61368,7 @@ msgstr "crwdns138428:0crwdne138428:0"
msgid "to"
msgstr "crwdns90180:0crwdne90180:0"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr "crwdns90182:0crwdne90182:0"
@@ -61265,7 +61408,7 @@ msgstr "crwdns90196:0{0}crwdne90196:0"
msgid "{0} '{1}' is disabled"
msgstr "crwdns90198:0{0}crwdnd90198:0{1}crwdne90198:0"
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr "crwdns90200:0{0}crwdnd90200:0{1}crwdnd90200:0{2}crwdne90200:0"
@@ -61297,7 +61440,7 @@ msgstr "crwdns90212:0{0}crwdnd90212:0{1}crwdne90212:0"
msgid "{0} Digest"
msgstr "crwdns90214:0{0}crwdne90214:0"
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr "crwdns90216:0{0}crwdnd90216:0{1}crwdnd90216:0{2}crwdnd90216:0{3}crwdne90216:0"
@@ -61313,7 +61456,7 @@ msgstr "crwdns90220:0{0}crwdnd90220:0{1}crwdne90220:0"
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr "crwdns90222:0{0}crwdne90222:0"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr "crwdns90224:0{0}crwdne90224:0"
@@ -61329,19 +61472,19 @@ msgstr "crwdns90226:0{0}crwdnd90226:0{1}crwdne90226:0"
msgid "{0} account not found while submitting purchase receipt"
msgstr "crwdns90228:0{0}crwdne90228:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr "crwdns90230:0{0}crwdnd90230:0{1}crwdnd90230:0{2}crwdne90230:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr "crwdns90232:0{0}crwdnd90232:0{1}crwdne90232:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr "crwdns90234:0{0}crwdnd90234:0{1}crwdne90234:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr "crwdns90236:0{0}crwdnd90236:0{1}crwdne90236:0"
@@ -61349,7 +61492,7 @@ msgstr "crwdns90236:0{0}crwdnd90236:0{1}crwdne90236:0"
msgid "{0} already has a Parent Procedure {1}."
msgstr "crwdns90238:0{0}crwdnd90238:0{1}crwdne90238:0"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr "crwdns90240:0{0}crwdnd90240:0{1}crwdne90240:0"
@@ -61408,7 +61551,7 @@ msgstr "crwdns90260:0{0}crwdne90260:0"
msgid "{0} entered twice {1} in Item Taxes"
msgstr "crwdns90262:0{0}crwdnd90262:0{1}crwdne90262:0"
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr "crwdns90264:0{0}crwdnd90264:0{1}crwdne90264:0"
@@ -61461,7 +61604,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr "crwdns90278:0{0}crwdnd90278:0{1}crwdne90278:0"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr "crwdns90280:0{0}crwdnd90280:0{1}crwdne90280:0"
@@ -61536,7 +61679,7 @@ msgstr "crwdns90306:0{0}crwdne90306:0"
msgid "{0} must be negative in return document"
msgstr "crwdns90308:0{0}crwdne90308:0"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr "crwdns112674:0{0}crwdnd112674:0{1}crwdne112674:0"
@@ -61552,7 +61695,7 @@ msgstr "crwdns90314:0{0}crwdne90314:0"
msgid "{0} payment entries can not be filtered by {1}"
msgstr "crwdns90316:0{0}crwdnd90316:0{1}crwdne90316:0"
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr "crwdns90318:0{0}crwdnd90318:0{1}crwdnd90318:0{2}crwdnd90318:0{3}crwdne90318:0"
@@ -61613,7 +61756,7 @@ msgstr "crwdns90340:0{0}crwdnd90340:0{1}crwdne90340:0"
msgid "{0} {1} Manually"
msgstr "crwdns104706:0{0}crwdnd104706:0{1}crwdne104706:0"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr "crwdns90342:0{0}crwdnd90342:0{1}crwdne90342:0"
@@ -61678,7 +61821,7 @@ msgstr "crwdns90366:0{0}crwdnd90366:0{1}crwdne90366:0"
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr "crwdns90368:0{0}crwdnd90368:0{1}crwdne90368:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr "crwdns90370:0{0}crwdnd90370:0{1}crwdne90370:0"
@@ -61690,7 +61833,7 @@ msgstr "crwdns90372:0{0}crwdnd90372:0{1}crwdne90372:0"
msgid "{0} {1} is frozen"
msgstr "crwdns90374:0{0}crwdnd90374:0{1}crwdne90374:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr "crwdns90376:0{0}crwdnd90376:0{1}crwdne90376:0"
@@ -61702,12 +61845,12 @@ msgstr "crwdns90378:0{0}crwdnd90378:0{1}crwdne90378:0"
msgid "{0} {1} is not associated with {2} {3}"
msgstr "crwdns90380:0{0}crwdnd90380:0{1}crwdnd90380:0{2}crwdnd90380:0{3}crwdne90380:0"
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr "crwdns90382:0{0}crwdnd90382:0{1}crwdne90382:0"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr "crwdns90384:0{0}crwdnd90384:0{1}crwdne90384:0"
@@ -61719,7 +61862,7 @@ msgstr "crwdns90386:0{0}crwdnd90386:0{1}crwdne90386:0"
msgid "{0} {1} must be submitted"
msgstr "crwdns90390:0{0}crwdnd90390:0{1}crwdne90390:0"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr "crwdns90392:0{0}crwdnd90392:0{1}crwdnd90392:0{2}crwdne90392:0"
@@ -61754,7 +61897,7 @@ msgstr "crwdns90404:0{0}crwdnd90404:0{1}crwdnd90404:0{2}crwdne90404:0"
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr "crwdns90406:0{0}crwdnd90406:0{1}crwdnd90406:0{2}crwdnd90406:0{3}crwdne90406:0"
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr "crwdns90408:0{0}crwdnd90408:0{1}crwdnd90408:0{2}crwdne90408:0"
@@ -61832,7 +61975,7 @@ msgstr "crwdns154280:0{doctype}crwdnd154280:0{name}crwdne154280:0"
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr "crwdns154282:0{field_label}crwdnd154282:0{doctype}crwdne154282:0"
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr "crwdns90442:0{item_name}crwdnd90442:0{sample_size}crwdnd90442:0{accepted_quantity}crwdne90442:0"
@@ -61840,7 +61983,7 @@ msgstr "crwdns90442:0{item_name}crwdnd90442:0{sample_size}crwdnd90442:0{accepted
msgid "{ref_doctype} {ref_name} is {status}."
msgstr "crwdns154284:0{ref_doctype}crwdnd154284:0{ref_name}crwdnd154284:0{status}crwdne154284:0"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr "crwdns90446:0crwdne90446:0"
@@ -61898,7 +62041,7 @@ msgstr "crwdns143234:0crwdne143234:0"
msgid "{} To Bill"
msgstr "crwdns143236:0crwdne143236:0"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr "crwdns90450:0crwdne90450:0"
diff --git a/erpnext/locale/es.po b/erpnext/locale/es.po
index 1eadf669c4c..58b133e012a 100644
--- a/erpnext/locale/es.po
+++ b/erpnext/locale/es.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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:09\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:05\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Spanish\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr " Producto"
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr "'Días desde la última orden' debe ser mayor que o igual a cero"
msgid "'Default {0} Account' in Company {1}"
msgstr "'Cuenta {0} Predeterminada' en la Compañía {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr "'Entradas' no pueden estar vacías"
@@ -919,11 +919,11 @@ msgstr "Tus accesos directos\n"
msgid "Your Shortcuts"
msgstr "Tus accesos directos"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr "Total general: {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr "Importe pendiente: {0}"
@@ -1319,10 +1319,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1627,7 +1627,7 @@ msgstr "Cuenta {0}: la cuenta padre {1} no existe"
msgid "Account {0}: You can not assign itself as parent account"
msgstr "Cuenta {0}: no puede asignarse a sí misma como cuenta padre"
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr "Cuenta: {0} es capital Trabajo en progreso y no puede actualizarse mediante Entrada de diario"
@@ -2116,7 +2116,7 @@ msgstr "Cuentas congeladas hasta la fecha"
msgid "Accounts Manager"
msgstr "Gerente de Cuentas"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr "Error por cuentas inexistentes"
@@ -2303,7 +2303,7 @@ msgstr "Configuración de cuentas"
msgid "Accounts User"
msgstr "Usuario de Cuentas"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr "Tabla de cuentas no puede estar vacía."
@@ -2663,6 +2663,10 @@ msgstr "Hora final real"
msgid "Actual Expense"
msgstr "Gasto actual"
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr ""
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2800,7 +2804,7 @@ msgstr "Añadir / Editar precios"
msgid "Add Child"
msgstr "Crear subcategoría"
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr "Añadir Columnas en Moneda de Transacción"
@@ -3606,7 +3610,7 @@ msgstr "Importe Anticipado"
msgid "Advance amount cannot be greater than {0} {1}"
msgstr "Cantidad de avance no puede ser mayor que {0} {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr "El anticipo pagado contra {0} {1} no puede ser mayor que el total general {2}."
@@ -3663,7 +3667,7 @@ msgstr "Contra"
#: 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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr "Contra la cuenta"
@@ -3732,7 +3736,7 @@ msgstr "Contra la Cuenta de Gastos"
msgid "Against Income Account"
msgstr "Contra cuenta de ingresos"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr "El asiento contable {0} no tiene ninguna entrada {1} que vincular"
@@ -3780,7 +3784,7 @@ msgstr "Contra factura del proveedor {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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr "Contra comprobante"
@@ -3792,7 +3796,7 @@ msgstr "Contra comprobante"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr "Contra el Número de Comprobante"
@@ -3804,8 +3808,8 @@ msgstr "Contra el Número de Comprobante"
#: 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr "Tipo de comprobante"
@@ -3931,7 +3935,7 @@ msgstr "Todos"
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr "Todas las cuentas"
@@ -4099,7 +4103,7 @@ msgstr "Todos los artículos ya están solicitados"
msgid "All items have already been Invoiced/Returned"
msgstr "Todos los artículos ya han sido facturados / devueltos"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr "Ya se han recibido todos los artículos"
@@ -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 "Todos los artículos necesarios (LdM) se obtendrán de la lista de materiales y se rellenarán en esta tabla. Aquí también puede cambiar el Almacén de Origen para cualquier artículo. Y durante la producción, puede hacer un seguimiento de las materias primas transferidas desde esta tabla."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr "Todos estos artículos ya han sido facturados / devueltos"
@@ -5011,7 +5015,7 @@ msgstr "Modificado desde"
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5151,7 +5155,7 @@ msgstr "Monto en Figura"
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr "Importe en Moneda de la Cuenta"
@@ -5302,7 +5306,7 @@ msgstr "Ya existe otro registro de presupuesto '{0}' contra {1} '{2}
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr "Otro registro de Asignación de Centro de Coste {0} aplicable desde {1}, por lo tanto esta asignación será aplicable hasta {2}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr "Ya se ha tramitado otra solicitud de pago"
@@ -5885,7 +5889,7 @@ msgstr "Capitalización de Activo Articulo de Stock"
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5927,7 +5931,7 @@ msgstr "Calendario de depreciación de Activo"
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr "Calendario de depreciación de activos para el activo {0} y el libro de finanzas {1} no está utilizando la depreciación por turnos"
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr "No se encontró un calendario de depreciación de activos para el activo {0} y el libro financiero {1}"
@@ -5966,7 +5970,7 @@ msgstr ""
msgid "Asset Finance Book"
msgstr "Libro de Finanzas de Activos"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr "Id de Activo"
@@ -6042,7 +6046,7 @@ msgstr "Movimiento de activo {0} creado"
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr "Nombre de Activo"
@@ -6128,9 +6132,9 @@ msgstr "Estado del Activo"
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr "Valor del activo"
@@ -6159,7 +6163,7 @@ msgstr "Activo cancelado"
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "Activo no se puede cancelar, como ya es {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr "El activo no puede desecharse antes de la última entrada de depreciación."
@@ -6191,7 +6195,7 @@ msgstr "Activo fuera de servicio debido a la reparación del activo {0}"
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr "Activo recibido en la ubicación {0} y entregado al empleado {1}"
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr "Activo restituido"
@@ -6203,11 +6207,11 @@ msgstr "Activo restituido después de la Capitalización de Activos {0} fue canc
msgid "Asset returned"
msgstr "Activo devuelto"
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr "Activo desechado"
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr "Activos desechado a través de entrada de diario {0}"
@@ -6232,7 +6236,7 @@ msgstr "Activo actualizado tras ser dividido en Activo {0}"
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr "Activo {0} no puede ser desechado, debido a que ya es {1}"
@@ -6265,7 +6269,15 @@ msgstr "El activo {0} ha sido actualizado. Por favor, establezca los detalles de
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr ""
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr "Activo {0} debe ser validado"
@@ -6646,7 +6658,7 @@ msgstr "Reconciliación Automática"
msgid "Auto Reconcile Payments"
msgstr "Reconciliación Automática de Pagos"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr "Reconciliación Automática"
@@ -6656,7 +6668,7 @@ msgstr "Reconciliación Automática"
msgid "Auto Reconciliation Job Trigger"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr ""
@@ -6831,7 +6843,7 @@ msgstr "Cantidad de lotes disponibles en almacén"
msgid "Available Batch Report"
msgstr "Informe de lotes disponibles"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr "Disponible para uso Fecha"
@@ -7060,7 +7072,7 @@ msgstr "LdM"
msgid "BOM 1"
msgstr "LdM 1"
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "BOM 1 {0} y BOM 2 {1} no deben ser iguales"
@@ -7298,23 +7310,23 @@ msgstr "BOM no contiene ningún artículo de stock"
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr "Recursión de la lista de materiales: {0} no puede ser secundario de {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr "Recursión de la LdM: {1} no puede ser principal o secundaria de {0}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr "La lista de materiales (LdM) {0} no pertenece al producto {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr "La lista de materiales (LdM) {0} debe estar activa"
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr "La lista de materiales (LdM) {0} debe ser validada"
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr "Lista de materiales {0} no encontrada para el artículo {1}"
@@ -7385,7 +7397,7 @@ msgstr "Balance"
msgid "Balance (Dr - Cr)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr "Balance ({0})"
@@ -7864,7 +7876,7 @@ msgstr "Tarifa base"
msgid "Base Tax Withholding Net Total"
msgstr "Base Imponible Retención Neta Total"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr "Total base"
@@ -8069,7 +8081,9 @@ msgstr "Estado de Caducidad de Lote de Productos"
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -8080,7 +8094,7 @@ msgstr "Lote Nro."
msgid "Batch No is mandatory"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr "Lote núm. {0} no existe"
@@ -8103,7 +8117,7 @@ msgstr "Nº de Lote"
msgid "Batch Nos"
msgstr "Números de Lote"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr "Los Núm. de Lote se crearon correctamente"
@@ -8116,7 +8130,7 @@ msgstr ""
msgid "Batch Number Series"
msgstr "Serie de Número de Lote"
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr ""
@@ -8229,7 +8243,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8542,8 +8556,8 @@ msgstr "Artículo de Orden Combinado"
msgid "Blanket Order Rate"
msgstr "Tasa de orden general"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr "Factura en Bloque"
@@ -8659,7 +8673,7 @@ msgstr "Activo Fijo Reservado"
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr ""
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr ""
@@ -9433,7 +9447,7 @@ msgstr "No se puede filtrar según el método de pago, si está agrupado por mé
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr "No se puede filtrar en función al 'No. de comprobante', si esta agrupado por el nombre"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr "Sólo se puede crear el pago contra {0} impagado"
@@ -9619,7 +9633,7 @@ msgstr "No se puede optimizar la ruta porque falta la dirección del conductor."
msgid "Cannot Relieve Employee"
msgstr "No se puede relevar al empleado"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr "No se pueden volver a validar entradas del libro mayor para comprobantes en un año fiscal cerrado."
@@ -9635,6 +9649,10 @@ msgstr ""
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr "No puede ser un elemento de Activo Fijo ya que se creo un Libro de Stock ."
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr ""
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr ""
@@ -9724,7 +9742,7 @@ msgstr ""
msgid "Cannot create root account."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr "No se puede desactivar o cancelar la 'Lista de Materiales (LdM)' si esta vinculada con otras"
@@ -9741,7 +9759,7 @@ msgstr "No se puede deducir cuando categoría es para ' Valoración ' o ' de Val
msgid "Cannot delete Exchange Gain/Loss row"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr "No se puede eliminar el No. de serie {0}, ya que esta siendo utilizado en transacciones de stock"
@@ -10187,11 +10205,11 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr "Importe de Cambio"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr "Cambiar fecha de lanzamiento"
@@ -10204,7 +10222,7 @@ msgstr "Cambiar fecha de lanzamiento"
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr ""
@@ -11012,6 +11030,7 @@ msgstr "Compañías"
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11159,6 +11178,7 @@ msgstr "Compañías"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11244,8 +11264,8 @@ msgstr "Compañías"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11561,7 +11581,7 @@ msgstr "Número de Identificación Fiscal de la Compañía"
msgid "Company and Posting Date is mandatory"
msgstr "La Empresa y la Fecha de Publicación son obligatorias"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr "Las monedas de la empresa de ambas compañías deben coincidir para las Transacciones entre empresas."
@@ -12842,7 +12862,7 @@ msgstr "Costo"
#: 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12861,7 +12881,7 @@ msgstr "Costo"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -13074,7 +13094,7 @@ msgstr ""
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr "No se pudo crear automáticamente el Cliente debido a que faltan los siguientes campos obligatorios:"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr "No se pudo crear una Nota de Crédito automáticamente, desmarque 'Emitir Nota de Crédito' y vuelva a validarla"
@@ -13197,15 +13217,15 @@ msgstr "Cr"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13447,7 +13467,7 @@ msgstr "Crear Oportunidad"
msgid "Create POS Opening Entry"
msgstr "Crear entrada de apertura de punto de venta"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr "Crear entrada de pago"
@@ -13603,7 +13623,7 @@ msgstr "Creando Cuentas ..."
msgid "Creating Delivery Note ..."
msgstr "Creando Nota de Entrega..."
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr "Creando Dimensiones ..."
@@ -13623,7 +13643,7 @@ msgstr ""
msgid "Creating Purchase Order ..."
msgstr "Creando orden de compra ..."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13660,11 +13680,6 @@ msgstr "Creando {} a partir de {} {}"
msgid "Creation"
msgstr "Creación"
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr "Creación del documento No"
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr "Creación de {1}(s) exitosa"
@@ -13697,11 +13712,11 @@ msgstr ""
msgid "Credit"
msgstr "Haber"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr "Crédito (Transacción)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr "Crédito ({0})"
@@ -13844,7 +13859,7 @@ msgstr "Nota de crédito emitida"
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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr "Nota de crédito {0} se ha creado automáticamente"
@@ -14052,7 +14067,7 @@ msgstr "Taza"
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14151,7 +14166,7 @@ msgstr "El tipo de moneda/divisa no se puede cambiar después de crear la entrad
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr "Moneda para {0} debe ser {1}"
@@ -14501,6 +14516,7 @@ msgstr "¿Es personalizado? (Solo para esta web)"
#: 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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14528,6 +14544,10 @@ msgstr "Cliente / Producto / Grupo de Productos"
msgid "Customer / Lead Address"
msgstr "Dirección de cliente / Oportunidad"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr ""
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14929,7 +14949,7 @@ msgstr "Se requiere un cliente para el descuento"
#: 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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr "Cliente {0} no pertenece al proyecto {1}"
@@ -15281,7 +15301,7 @@ msgstr "Fecha de Emisión."
msgid "Date of Joining"
msgstr "Fecha de Ingreso"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr "Fecha de la Transacción"
@@ -15418,11 +15438,11 @@ msgstr "Estimado administrador del sistema,"
msgid "Debit"
msgstr "Debe"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr "Débito (Transacción)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr "Débito ({0})"
@@ -15496,7 +15516,7 @@ msgstr "Debitar a"
msgid "Debit To is required"
msgstr "Débito Para es requerido"
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr "El Débito y Crédito no es igual para {0} # {1}. La diferencia es {2}."
@@ -16563,7 +16583,7 @@ msgstr "Datos de demostración borrados"
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16638,9 +16658,9 @@ msgstr ""
msgid "Depreciate based on shifts"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr "Monto Depreciado"
@@ -16696,6 +16716,14 @@ msgstr "Entrada de depreciación"
msgid "Depreciation Entry Posting Status"
msgstr ""
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr ""
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16704,7 +16732,7 @@ msgstr ""
msgid "Depreciation Expense Account"
msgstr "Cuenta de gastos de depreciación"
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr ""
@@ -17590,6 +17618,10 @@ msgstr "Fecha de descuento"
msgid "Discount Percentage"
msgstr "Porcentaje de descuento"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr ""
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr ""
@@ -17822,7 +17854,7 @@ msgstr "Ajustes de despacho"
msgid "Disposal Date"
msgstr "Fecha de eliminación"
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr ""
@@ -18102,7 +18134,7 @@ msgstr "Documentos"
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr "Documentos: {0} tienen habilitados ingresos/gastos diferidos. No se pueden volver a publicar."
@@ -19141,7 +19173,7 @@ msgstr "Vacío"
msgid "Ems(Pica)"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr ""
@@ -19492,7 +19524,7 @@ msgstr ""
msgid "Enter a name for this Holiday List."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr "Introduzca el importe a canjear."
@@ -19553,7 +19585,7 @@ msgstr ""
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr "Introduzca el importe {0}"
@@ -19573,7 +19605,7 @@ msgid "Entity"
msgstr "Entidad"
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19668,7 +19700,7 @@ msgstr "Error al evaluar la fórmula de criterios"
msgid "Error in party matching for Bank Transaction {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr ""
@@ -19720,11 +19752,9 @@ msgstr "Tiempo estimado y costo"
msgid "Evaluation Period"
msgstr "Periodo de Evaluación"
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
-msgstr "Incluso las facturas que no tengan marcada la opción de aplicar la retención de impuestos se tendrán en cuenta para comprobar el incumplimiento del umbral acumulativo"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
+msgstr ""
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
@@ -20085,7 +20115,7 @@ msgstr "Valor esperado después de la Vida Útil"
msgid "Expense"
msgstr "Gastos"
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr "La cuenta de Gastos/Diferencia ({0}) debe ser una cuenta de 'utilidad o pérdida \""
@@ -20130,7 +20160,7 @@ msgstr "La cuenta de Gastos/Diferencia ({0}) debe ser una cuenta de 'utilidad o
msgid "Expense Account"
msgstr "Cuenta de costos"
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr "Falta la cuenta de gastos"
@@ -20437,7 +20467,7 @@ msgstr "Fecha de Falla"
msgid "Failure Description"
msgstr "Descripción del fallo"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr "Fallo: {0}"
@@ -21113,6 +21143,10 @@ msgstr "Artículo de Activos Fijos no debe ser un artículo de stock."
msgid "Fixed Asset Register"
msgstr "Registro de activos fijos"
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21243,7 +21277,7 @@ msgstr "Para el proveedor predeterminado (opcional)"
msgid "For Item"
msgstr "Para artículo"
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr ""
@@ -22135,7 +22169,7 @@ msgstr "Ref. De pago futuro"
msgid "Future Payments"
msgstr "Pagos futuros"
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr ""
@@ -22151,7 +22185,7 @@ msgstr ""
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr "Entrada GL"
@@ -22417,8 +22451,8 @@ msgid "Get Items"
msgstr "Obtener artículos"
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22777,7 +22811,7 @@ msgstr "Gramo/Litro"
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22787,7 +22821,7 @@ msgstr "Gramo/Litro"
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22908,8 +22942,8 @@ msgstr ""
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr "Importe Bruto de Compra"
@@ -23260,7 +23294,7 @@ msgstr "Hectopascal"
msgid "Height (cm)"
msgstr "Altura (cm)"
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr "Hola,"
@@ -23299,7 +23333,7 @@ msgstr "Texto de Ayuda"
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr "Le ayuda a distribuir el Presupuesto/Objetivo a lo largo de los meses si tiene estacionalidad en su negocio."
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr ""
@@ -23395,7 +23429,7 @@ msgstr "Mantener"
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr "Retener Factura"
@@ -23489,6 +23523,10 @@ msgstr "Horas"
msgid "Hours Spent"
msgstr "Horas Dedicadas"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr ""
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23825,6 +23863,10 @@ msgstr ""
msgid "If more than one package of the same type (for print)"
msgstr "Si es más de un paquete del mismo tipo (para impresión)"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr ""
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23841,6 +23883,10 @@ msgstr "En caso contrario, puedes Cancelar/Validar esta entrada"
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr ""
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23923,6 +23969,10 @@ msgstr "Si está marcado, se pueden usar varios materiales para una sola orden d
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr "Si se marca, el costo de la lista de materiales se actualizará automáticamente en función de la tasa de valoración / tasa de lista de precios / última tasa de compra de materias primas."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr ""
@@ -24017,7 +24067,7 @@ msgstr "Ignorar Stock Vacío"
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -24069,7 +24119,7 @@ msgstr ""
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr ""
@@ -24832,7 +24882,7 @@ msgstr "Configuración de llamadas entrantes"
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24905,7 +24955,7 @@ msgstr ""
msgid "Incorrect Stock Value Report"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr ""
@@ -25072,13 +25122,13 @@ msgstr "Insertar nuevos registros"
msgid "Inspected By"
msgstr "Inspeccionado por"
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr "Inspección Rechazada"
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr "Inspección Requerida"
@@ -25095,7 +25145,7 @@ msgstr "Inspección Requerida antes de Entrega"
msgid "Inspection Required before Purchase"
msgstr "Inspección Requerida antes de Compra"
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr ""
@@ -25125,7 +25175,7 @@ msgstr "Nota de Instalación"
msgid "Installation Note Item"
msgstr "Nota de instalación de elementos"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr "La nota de instalación {0} ya se ha validado"
@@ -25183,7 +25233,7 @@ msgstr "Permisos Insuficientes"
#: 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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "Insuficiente Stock"
@@ -25374,7 +25424,7 @@ msgstr "Transferencias Internas"
msgid "Internal Work History"
msgstr "Historial de trabajo interno"
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr ""
@@ -25410,7 +25460,7 @@ msgid "Invalid Account"
msgstr "Cuenta no válida"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr ""
@@ -25438,7 +25488,7 @@ msgstr "Pedido abierto inválido para el cliente y el artículo seleccionado"
msgid "Invalid Child Procedure"
msgstr "Procedimiento de niño no válido"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr "Empresa inválida para transacciones entre empresas."
@@ -25496,7 +25546,7 @@ msgid "Invalid Ledger Entries"
msgstr ""
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr "Entrada de apertura no válida"
@@ -25524,7 +25574,7 @@ msgstr "Función principal no válida"
msgid "Invalid Priority"
msgstr "Prioridad inválida"
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr ""
@@ -25608,8 +25658,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr ""
@@ -25617,7 +25667,7 @@ msgstr ""
msgid "Invalid {0}"
msgstr "Inválido {0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr "No válido {0} para la transacción entre empresas."
@@ -25827,7 +25877,7 @@ msgstr "Cant. Facturada"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26879,6 +26929,8 @@ msgstr "Carrito de Productos"
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26897,7 +26949,11 @@ msgstr "Código del Producto"
msgid "Item Code (Final Product)"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr ""
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr "El código del producto no se puede cambiar por un número de serie"
@@ -27301,6 +27357,7 @@ msgstr "Fabricante del artículo"
#: 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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28221,7 +28278,7 @@ msgstr "Entrada de diario para desguace"
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr "El asiento {0} no tiene cuenta de {1} o ya esta enlazado con otro comprobante"
@@ -28427,7 +28484,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29143,7 +29200,7 @@ msgstr "Local"
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29814,7 +29871,7 @@ msgstr ""
msgid "Mandatory Depends On"
msgstr "Obligatorio depende de"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr ""
@@ -29904,6 +29961,7 @@ msgstr "¡No se puede crear una entrada manual! Deshabilite la entrada automáti
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30462,6 +30520,7 @@ msgid "Material Requested"
msgstr "Material Solicitado"
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr "Solicitudes de Material"
@@ -30817,7 +30876,7 @@ msgstr "Mensaje"
msgid "Message Examples"
msgstr "Ejemplos de Mensaje"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr "Mensaje enviado"
@@ -31131,8 +31190,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr "Cuenta faltante"
@@ -31150,6 +31209,10 @@ msgstr ""
msgid "Missing Default in Company"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr ""
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr ""
@@ -31182,7 +31245,7 @@ msgstr "Valores faltantes requeridos"
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr "Falta la plantilla de correo electrónico para el envío. Por favor, establezca uno en la configuración de entrega."
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr ""
@@ -31848,7 +31911,7 @@ msgstr "Gas natural"
msgid "Needs Analysis"
msgstr "Necesita Anáisis"
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr ""
@@ -32280,7 +32343,7 @@ msgstr "Nueva orden de venta (OV)"
msgid "New Sales Person Name"
msgstr "Nombre nuevo encargado de ventas"
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr "El número de serie no tiene almacén asignado. El almacén debe establecerse por entradas de inventario o recibos de compra"
@@ -32316,7 +32379,7 @@ msgstr "Nuevo ejercicio fiscal creado:- "
msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date"
msgstr "Las nuevas facturas se generarán según el cronograma incluso si las facturas actuales están impagas o vencidas"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr "La nueva fecha de lanzamiento debe estar en el futuro"
@@ -32425,7 +32488,7 @@ msgstr "Ninguna acción"
msgid "No Answer"
msgstr "Sin respuesta"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr "No se encontró ningún cliente para transacciones entre empresas que representen a la empresa {0}"
@@ -32482,9 +32545,9 @@ msgstr "No se encontraron facturas pendientes para este tercero"
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr "Sin permiso"
@@ -32519,7 +32582,7 @@ msgstr "No hay existencias disponibles actualmente"
msgid "No Summary"
msgstr "Sin resumen"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr "No se encontró ningún proveedor para transacciones entre empresas que represente a la empresa {0}"
@@ -32617,7 +32680,7 @@ msgstr ""
msgid "No items to be received are overdue"
msgstr "No hay elementos para ser recibidos están vencidos"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr ""
@@ -32751,11 +32814,11 @@ msgstr ""
msgid "No values"
msgstr "Sin valores"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr "No se ha encontrado {0} para transacciones entre empresas."
@@ -32790,7 +32853,7 @@ msgstr ""
msgid "Non Profit"
msgstr "Sin fines de lucro"
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr "Artículos sin stock"
@@ -32969,7 +33032,7 @@ msgstr ""
msgid "Note: Email will not be sent to disabled users"
msgstr "Nota: El correo electrónico no se enviará a los usuarios deshabilitados"
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr ""
@@ -32989,7 +33052,7 @@ msgstr "Nota: este centro de costes es una categoría. No se pueden crear asient
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr "Nota: {0}"
@@ -33005,6 +33068,7 @@ msgstr "Nota: {0}"
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33440,6 +33504,12 @@ msgstr "Sólo las sub-cuentas son permitidas en una transacción"
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr ""
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr ""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33641,8 +33711,8 @@ msgstr "Apertura (Deb)"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr "Apertura de la depreciación acumulada"
@@ -33684,7 +33754,7 @@ msgstr "Fecha de apertura"
msgid "Opening Entry"
msgstr "Asiento de apertura"
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr ""
@@ -33712,7 +33782,7 @@ msgid "Opening Invoice Item"
msgstr "Abrir el Artículo de la Factura"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 ""
@@ -33786,7 +33856,7 @@ msgstr "Costo de funcionamiento (Divisa de la Compañia)"
msgid "Operating Cost Per BOM Quantity"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr "Costo operativo según la orden de trabajo / BOM"
@@ -33942,7 +34012,7 @@ msgstr "Operaciones"
msgid "Operations Routing"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr "Las operaciones no pueden dejarse en blanco"
@@ -34534,7 +34604,7 @@ msgstr "Tolerancia por exceso de entrega/recepción (%)"
msgid "Over Picking Allowance"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr ""
@@ -34986,7 +35056,7 @@ msgstr "Artículo Empacado"
msgid "Packed Items"
msgstr "Productos Empacados"
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr ""
@@ -35021,7 +35091,7 @@ msgstr "Lista de embalaje"
msgid "Packing Slip Item"
msgstr "Lista de embalaje del producto"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr "Lista(s) de embalaje cancelada(s)"
@@ -35107,7 +35177,7 @@ msgstr "Pagado"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35382,7 +35452,7 @@ msgstr ""
msgid "Partial Payment in POS Transactions are not allowed."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr ""
@@ -35576,9 +35646,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35739,9 +35809,9 @@ msgstr "Producto específico de la Parte"
#: 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35906,7 +35976,7 @@ msgstr "Configuración del pagador"
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -36042,7 +36112,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr "El registro del pago ha sido modificado antes de su modificación. Por favor, inténtelo de nuevo."
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr "Entrada de Pago ya creada"
@@ -36251,7 +36321,7 @@ msgstr "Referencias del Pago"
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36277,11 +36347,11 @@ msgstr "Tipo de Solicitud de Pago"
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr "Solicitud de pago para {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr ""
@@ -36439,7 +36509,7 @@ msgstr ""
msgid "Payment Unlink Error"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr "El pago para {0} {1} no puede ser mayor que el pago pendiente {2}"
@@ -36760,7 +36830,7 @@ msgstr "Período"
msgid "Period Based On"
msgstr "Periodo basado en"
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr ""
@@ -37363,7 +37433,7 @@ msgstr "Agregue la cuenta a la empresa de nivel raíz - {}"
msgid "Please add {1} role to user {0}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr ""
@@ -37371,7 +37441,7 @@ msgstr ""
msgid "Please attach CSV file"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr ""
@@ -37384,7 +37454,7 @@ msgstr ""
msgid "Please cancel related transaction."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr "Por favor, consulte la opción Multi moneda para permitir cuentas con otra divisa"
@@ -37461,7 +37531,7 @@ msgstr "Cree un recibo de compra o una factura de compra para el artículo {0}"
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr ""
@@ -37585,7 +37655,7 @@ msgstr "Por favor, ingrese primero el recibo de compra"
msgid "Please enter Receipt Document"
msgstr "Por favor, introduzca recepción de documentos"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr "Por favor, introduzca la fecha de referencia"
@@ -37710,8 +37780,8 @@ msgstr "Por favor, asegurate de que realmente desea borrar todas las transaccion
msgid "Please mention 'Weight UOM' along with Weight."
msgstr ""
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr ""
@@ -37839,7 +37909,7 @@ msgstr "Por favor, seleccione fecha de publicación antes de seleccionar la Part
msgid "Please select Posting Date first"
msgstr "Por favor, seleccione fecha de publicación primero"
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr "Por favor, seleccione la lista de precios"
@@ -37871,7 +37941,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr "Seleccione una Lista de Materiales"
@@ -37961,6 +38031,10 @@ msgstr "Por favor, seleccione un valor para {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
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr ""
@@ -37969,7 +38043,7 @@ msgstr ""
msgid "Please select atleast one operation to create Job Card"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr "Por favor, seleccione la cuenta correcta"
@@ -38050,15 +38124,15 @@ msgstr "Por favor, seleccione primero {0}"
msgid "Please set 'Apply Additional Discount On'"
msgstr "Por favor, establece \"Aplicar descuento adicional en\""
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr "Ajuste 'Centro de la amortización del coste del activo' en la empresa {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr "Por favor, fije \"Ganancia/Pérdida en la venta de activos\" en la empresa {0}."
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr ""
@@ -38066,7 +38140,7 @@ msgstr ""
msgid "Please set Account"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr ""
@@ -38092,7 +38166,7 @@ msgstr ""
msgid "Please set Company"
msgstr "Por favor seleccione Compañía"
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr "Por favor establezca Cuentas relacionadas con la depreciación en la Categoría de Activo {0} o Compañía {1}."
@@ -38110,7 +38184,7 @@ msgstr ""
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr ""
@@ -38173,7 +38247,7 @@ msgstr "Configura la Cuenta en Almacén {0}"
msgid "Please set an Address on the Company '%s'"
msgstr ""
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr ""
@@ -38189,23 +38263,23 @@ msgstr "Establezca al menos una fila en la Tabla de impuestos y cargos"
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr "Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr "Establezca una cuenta bancaria o en efectivo predeterminada en el modo de pago {}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "Establezca la cuenta bancaria o en efectivo predeterminada en el modo de pago {}"
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr ""
@@ -38309,7 +38383,7 @@ msgstr ""
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr ""
@@ -38322,7 +38396,7 @@ msgid "Please specify Company"
msgstr "Por favor, especifique la compañía"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr "Por favor, especifique la compañía para continuar"
@@ -38495,6 +38569,7 @@ msgstr "Gastos postales"
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38529,11 +38604,11 @@ msgstr "Gastos postales"
#: 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38552,6 +38627,7 @@ msgstr "Gastos postales"
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38561,6 +38637,7 @@ msgstr "Gastos postales"
#: 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_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
@@ -39126,6 +39203,14 @@ msgstr "Código de artículo de regla de precios"
msgid "Pricing Rule Item Group"
msgstr "Grupo de elementos de regla de precios"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr ""
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr ""
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr "La regla de precios {0} se actualiza"
@@ -39184,6 +39269,10 @@ msgstr "La regla de precios {0} se actualiza"
msgid "Pricing Rules"
msgstr "Reglas de precios"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr ""
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39571,7 +39660,7 @@ msgstr "Descripción del proceso"
msgid "Process Loss"
msgstr "Pérdida por Proceso"
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr ""
@@ -40061,7 +40150,7 @@ msgstr "Progreso (%)"
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40536,7 +40625,7 @@ msgstr "Analítico de compras"
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr "Fecha de compra"
@@ -40692,7 +40781,7 @@ msgstr "Director de compras"
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40868,9 +40957,9 @@ msgstr "Lista de precios para las compras"
#. 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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41751,6 +41840,7 @@ msgstr "Objetivo de revisión de calidad"
#: 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/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
@@ -41867,7 +41957,7 @@ msgstr "La cantidad no debe ser más de {0}"
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr "Cantidad del producto obtenido después de la fabricación / empaquetado desde las cantidades determinadas de materia prima"
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr "Cantidad requerida para el producto {0} en la línea {1}"
@@ -42716,7 +42806,7 @@ msgid "Reason"
msgstr "Razón"
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "Motivo de Poner en Espera"
@@ -43152,7 +43242,7 @@ msgstr "Canjear Contra"
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr "Canjear Puntos de Lealtad"
@@ -43284,7 +43374,7 @@ msgstr "Fecha Ref."
msgid "Reference"
msgstr "Referencia"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr "Referencia #{0} con fecha {1}"
@@ -43422,7 +43512,7 @@ msgstr "Nombre Referencia"
msgid "Reference No"
msgstr "Nº de referencia"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr "Se requiere de No. de referencia y fecha para {0}"
@@ -43430,11 +43520,11 @@ msgstr "Se requiere de No. de referencia y fecha para {0}"
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr "Nro de referencia y fecha de referencia es obligatoria para las transacciones bancarias"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr "El No. de referencia es obligatoria si usted introdujo la fecha"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr "Numero de referencia."
@@ -43548,11 +43638,11 @@ msgstr "Referencia: {0}, Código del artículo: {1} y Cliente: {2}"
msgid "References"
msgstr "Referencias"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr ""
@@ -43697,8 +43787,8 @@ msgstr "Relación"
#. 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43717,7 +43807,7 @@ msgstr "Fecha de relevo"
msgid "Remaining"
msgstr "Restante"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr ""
@@ -43730,7 +43820,7 @@ msgstr "Balance restante"
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr "Observación"
@@ -43779,7 +43869,7 @@ msgstr "Observación"
#: 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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -44090,7 +44180,7 @@ msgstr ""
msgid "Repost Status"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr ""
@@ -44414,7 +44504,7 @@ msgstr "Vuelva a seleccionar, si el contacto elegido se edita después de guarda
msgid "Reseller"
msgstr "Revendedor"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr "Vuelva a enviar el pago por correo electrónico"
@@ -44883,7 +44973,7 @@ msgstr "Retornar"
msgid "Return / Credit Note"
msgstr "Devolución / Nota de Crédito"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr "Retorno / Nota de Crédito"
@@ -45407,12 +45497,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1919
msgid "Row #{0} (Payment Table): Amount must be negative"
msgstr "Fila #{0} (Tabla de pagos): El importe debe ser negativo"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:515
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "Fila #{0} (Tabla de pagos): El importe debe ser positivo"
@@ -45558,7 +45648,7 @@ msgstr "Fila #{0}: Entrada duplicada en Referencias {1} {2}"
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr "Fila #{0}: La fecha de entrega esperada no puede ser anterior a la fecha de la orden de compra"
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr ""
@@ -45582,11 +45672,11 @@ msgstr ""
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr ""
@@ -45606,7 +45696,7 @@ msgstr "Fila # {0}: Elemento agregado"
msgid "Row #{0}: Item {1} does not exist"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr ""
@@ -45642,7 +45732,7 @@ msgstr ""
msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
msgstr "Fila #{0}: No se permite cambiar de proveedores debido a que la Orden de Compra ya existe"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr ""
@@ -45687,15 +45777,15 @@ msgstr ""
msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr "Fila #{0}: Se requiere inspección de calidad para el artículo {1}"
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr "Fila #{0}: La inspección de calidad {1} no se ha validado para el artículo: {2}"
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr "Fila #{0}: La inspección de calidad {1} fue rechazada para el artículo {2}"
@@ -45704,7 +45794,7 @@ msgstr "Fila #{0}: La inspección de calidad {1} fue rechazada para el artículo
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "Fila # {0}: La cantidad del artículo {1} no puede ser cero."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr ""
@@ -45801,19 +45891,19 @@ msgstr "Fila # {0}: El estado debe ser {1} para el descuento de facturas {2}"
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr ""
@@ -45821,8 +45911,8 @@ msgstr ""
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr ""
@@ -46003,7 +46093,7 @@ msgstr ""
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr "Fila {0}: La cuenta {1} y el tipo de tercero {2} tienen diferentes tipos de cuenta"
@@ -46011,11 +46101,11 @@ msgstr "Fila {0}: La cuenta {1} y el tipo de tercero {2} tienen diferentes tipos
msgid "Row {0}: Activity Type is mandatory."
msgstr "Fila {0}: Tipo de actividad es obligatoria."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr "Fila {0}: Avance contra el Cliente debe ser de crédito"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr "Fila {0}: Avance contra el Proveedor debe ser debito"
@@ -46035,7 +46125,7 @@ msgstr ""
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr "Fila {0}: Lista de materiales no se encuentra para el elemento {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr ""
@@ -46051,7 +46141,7 @@ msgstr ""
msgid "Row {0}: Cost center is required for an item {1}"
msgstr "Fila {0}: Centro de Costos es necesario para un elemento {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr "Línea {0}: La entrada de crédito no puede vincularse con {1}"
@@ -46059,7 +46149,7 @@ msgstr "Línea {0}: La entrada de crédito no puede vincularse con {1}"
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr "Fila {0}: Divisa de la lista de materiales # {1} debe ser igual a la moneda seleccionada {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr "Línea {0}: La entrada de débito no puede vincularse con {1}"
@@ -46075,7 +46165,7 @@ msgstr "Fila {0}: la fecha de vencimiento en la tabla de condiciones de pago no
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "Fila {0}: Tipo de cambio es obligatorio"
@@ -46109,7 +46199,7 @@ msgstr "Fila {0}: Tiempo Desde y Tiempo Hasta es obligatorio."
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr "Fila {0}: Tiempo Desde y Tiempo Hasta de {1} se solapan con {2}"
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46121,7 +46211,7 @@ msgstr "Fila {0}: el tiempo debe ser menor que el tiempo"
msgid "Row {0}: Hours value must be greater than zero."
msgstr "Fila {0}: valor Horas debe ser mayor que cero."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr "Fila {0}: Referencia no válida {1}"
@@ -46145,7 +46235,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr ""
@@ -46153,7 +46243,7 @@ msgstr ""
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr "Línea {0}: Socio / Cuenta no coincide con {1} / {2} en {3} {4}"
@@ -46165,11 +46255,11 @@ msgstr "Línea {0}: el tipo de entidad se requiere para la cuenta por cobrar/pag
msgid "Row {0}: Payment Term is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr "Línea {0}: El pago para la compra/venta siempre debe estar marcado como anticipo"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr "Línea {0}: Por favor, verifique 'Es un anticipo' para la cuenta {1} si se trata de una entrada de pago anticipado."
@@ -46237,7 +46327,7 @@ msgstr ""
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr "Fila {0}: el artículo subcontratado es obligatorio para la materia prima {1}"
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr "Fila {0}: El almacén de destino es obligatorio para las transferencias internas"
@@ -46261,7 +46351,7 @@ msgstr ""
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "Línea {0}: El factor de conversión de (UdM) es obligatorio"
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr ""
@@ -46282,7 +46372,7 @@ msgstr "Fila {0}: {1} debe ser mayor que 0"
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr "Fila {0}: {1} {2} no puede ser la misma que {3} (Cuenta de la tercera parte) {4}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr "Línea {0}: {1} {2} no coincide con {3}"
@@ -46675,7 +46765,7 @@ msgstr ""
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr "La factura {0} ya ha sido validada"
@@ -46904,7 +46994,7 @@ msgstr ""
msgid "Sales Order Trends"
msgstr "Tendencias de ordenes de ventas"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr "Orden de venta requerida para el producto {0}"
@@ -47414,8 +47504,8 @@ msgstr "Sábado"
#: 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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47686,7 +47776,7 @@ msgstr "Costo de Material de Desecho (Moneda de la Compañia)"
msgid "Scrap Warehouse"
msgstr "Almacén de chatarra"
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr ""
@@ -47759,7 +47849,7 @@ msgstr "Secretario/a"
msgid "Section"
msgstr "Sección"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr "Código de sección"
@@ -48129,7 +48219,7 @@ msgstr "Seleccione, para que el usuario pueda buscar con estos campos"
msgid "Selected POS Opening Entry should be open."
msgstr "La entrada de apertura de POS seleccionada debe estar abierta."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr "La Lista de Precios seleccionada debe tener los campos de compra y venta marcados."
@@ -48313,7 +48403,7 @@ msgstr "Enviar con Archivo Adjunto"
msgid "Sender"
msgstr "Remitente"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr "Enviando"
@@ -48437,7 +48527,9 @@ msgstr ""
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48468,7 +48560,9 @@ msgid "Serial No Count"
msgstr "Serie sin recuento"
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr ""
@@ -48476,7 +48570,7 @@ msgstr ""
msgid "Serial No Range"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr ""
@@ -48516,6 +48610,13 @@ msgstr "Número de serie y de lote"
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr ""
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr ""
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr ""
@@ -48545,7 +48646,7 @@ msgstr "Número de serie {0} no pertenece al producto {1}"
msgid "Serial No {0} does not exist"
msgstr "El número de serie {0} no existe"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr ""
@@ -48594,7 +48695,7 @@ msgstr ""
msgid "Serial Nos and Batches"
msgstr "Números de serie y lotes"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr ""
@@ -48672,11 +48773,11 @@ msgstr ""
msgid "Serial and Batch Bundle"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr ""
@@ -49110,7 +49211,7 @@ msgstr ""
msgid "Set Loyalty Program"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr "Establecer nueva fecha de lanzamiento"
@@ -49365,7 +49466,7 @@ msgstr ""
msgid "Setting up company"
msgstr "Creando compañía"
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49549,7 +49650,7 @@ msgstr "Tipo de Envío"
msgid "Shipment details"
msgstr "Detalles del envío"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr "Envíos"
@@ -49796,6 +49897,10 @@ msgstr "Mostrar entradas canceladas"
msgid "Show Completed"
msgstr "Mostrar completado"
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr ""
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr "Mostrar la cantidad acumulada"
@@ -49911,7 +50016,7 @@ msgstr "Mostrar Vista Previa"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr "Mostrar Observaciones"
@@ -50216,13 +50321,27 @@ msgstr "Referencia"
msgid "Source DocType"
msgstr "DocType Fuente"
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr ""
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr "Nombre del documento de origen"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr ""
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr "Tipo de documento de origen"
@@ -50293,7 +50412,7 @@ msgstr "Dirección del Almacén de Origen"
msgid "Source Warehouse Address Link"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr ""
@@ -50804,7 +50923,7 @@ msgstr "Provincia del estado"
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51147,7 +51266,7 @@ msgstr "Entrada de stock {0} creada"
msgid "Stock Entry {0} has created"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr "La entrada de stock {0} no esta validada"
@@ -51370,13 +51489,13 @@ msgstr ""
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51385,13 +51504,13 @@ msgstr ""
msgid "Stock Reservation"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr ""
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr ""
@@ -51413,7 +51532,7 @@ msgstr ""
msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr ""
@@ -51658,7 +51777,7 @@ msgstr ""
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr ""
@@ -51674,7 +51793,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr ""
@@ -52542,10 +52661,15 @@ msgstr "Cant. Suministrada"
#: 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "Proveedor"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr ""
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52658,7 +52782,7 @@ msgstr "Factura de Proveedor"
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr "Fecha de factura de proveedor"
@@ -52672,8 +52796,8 @@ msgstr "Fecha de Factura de Proveedor no puede ser mayor que la fecha de publica
#: 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "Factura de proveedor No."
@@ -53220,16 +53344,16 @@ msgstr ""
msgid "System will notify to increase or decrease quantity or amount "
msgstr "El sistema notificará para aumentar o disminuir la cantidad o cantidad"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr ""
@@ -53246,7 +53370,7 @@ msgstr ""
msgid "TDS Payable"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr ""
@@ -53802,7 +53926,7 @@ msgstr "Tipo de impuestos"
msgid "Tax Withheld Vouchers"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr ""
@@ -54427,7 +54551,7 @@ msgstr "El acceso a la solicitud de cotización del portal está deshabilitado.
msgid "The BOM which will be replaced"
msgstr "La lista de materiales que será sustituida"
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr ""
@@ -54455,7 +54579,7 @@ msgstr ""
msgid "The Loyalty Program isn't valid for the selected company"
msgstr "El Programa de Lealtad no es válido para la Empresa seleccionada"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr ""
@@ -54479,7 +54603,7 @@ msgstr ""
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr ""
@@ -54501,7 +54625,7 @@ msgstr ""
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr "Cabecera de cuenta en Pasivo o Patrimonio Neto, en la que se contabilizarán los Resultados."
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr ""
@@ -54542,7 +54666,7 @@ msgstr "El campo Desde accionista no puede estar en blanco"
msgid "The field To Shareholder cannot be blank"
msgstr "El campo Para el accionista no puede estar en blanco"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr ""
@@ -54558,7 +54682,7 @@ msgstr "Los números de folio no coinciden"
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr ""
@@ -54819,6 +54943,10 @@ msgstr ""
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr "Hay mantenimiento activo o reparaciones contra el activo. Debes completarlos todos antes de cancelar el activo."
@@ -55085,7 +55213,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr ""
@@ -55093,7 +55221,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr ""
@@ -55868,6 +55996,10 @@ msgstr "Para incluir el impuesto en la línea {0} los impuestos de las lineas {1
msgid "To merge, following properties must be same for both items"
msgstr "Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr "Para anular esto, habilite "{0}" en la empresa {1}"
@@ -55885,7 +56017,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr ""
@@ -56107,7 +56239,7 @@ msgstr ""
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56269,7 +56401,7 @@ msgstr "La cantidad total de Crédito / Débito debe ser la misma que la entrada
msgid "Total Debit"
msgstr "Débito Total"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr "El débito total debe ser igual al crédito. La diferencia es {0}"
@@ -56862,6 +56994,10 @@ msgstr "Totales"
msgid "Traceability"
msgstr "Trazabilidad"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr ""
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56902,7 +57038,7 @@ msgstr "URL de Seguimiento"
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -57000,7 +57136,7 @@ msgstr "Configuración de Transacciones"
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr "tipo de transacción"
@@ -57022,7 +57158,7 @@ msgstr "Referencia de la transacción nro {0} fechada {1}"
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57619,7 +57755,11 @@ msgstr "Monto sin asignar"
msgid "Unassigned Qty"
msgstr "Cant. Sin asignar"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr "Desbloquear factura"
@@ -58986,7 +59126,7 @@ msgstr ""
msgid "Vendor Invoices"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr "Nombre del vendedor"
@@ -59053,7 +59193,7 @@ msgstr "Ajustes de video"
#: 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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59244,11 +59384,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59283,7 +59423,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr ""
@@ -59315,9 +59455,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59336,6 +59476,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_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
@@ -59545,6 +59686,7 @@ msgstr "Entrar"
#: 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_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
@@ -59653,7 +59795,7 @@ msgstr "Almacén y Referencia"
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr "El almacén no se puede eliminar, porque existen registros de inventario para el mismo."
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr "Almacén no se puede cambiar para el N º de serie"
@@ -59666,7 +59808,7 @@ msgid "Warehouse not found against the account {0}"
msgstr "Almacén no encontrado en la cuenta {0}"
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr "El almacén es requerido para el stock del producto {0}"
@@ -59817,7 +59959,7 @@ msgstr ""
msgid "Warning!"
msgstr "¡Advertencia!"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr "Advertencia: Existe otra {0} # {1} para la entrada de inventario {2}"
@@ -60300,6 +60442,7 @@ msgstr "Almacén de trabajo en curso"
#: 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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "Orden de trabajo"
@@ -60775,7 +60918,7 @@ msgstr ""
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr "No se le permite actualizar según las condiciones establecidas en {} Flujo de trabajo."
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr "No tiene permisos para agregar o actualizar las entradas antes de {0}"
@@ -60807,7 +60950,7 @@ msgstr "También puede configurar una cuenta CWIP predeterminada en la empresa {
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr "Puede cambiar la cuenta principal a una cuenta de balance o seleccionar una cuenta diferente."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr "Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'"
@@ -60824,7 +60967,7 @@ msgstr "Solo puede canjear max {0} puntos en este orden."
msgid "You can only select one mode of payment as default"
msgstr "Solo puede seleccionar un modo de pago por defecto"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr "Puede canjear hasta {0}."
@@ -60856,11 +60999,11 @@ msgstr ""
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr "No puede crear ni cancelar ningún asiento contable dentro del período contable cerrado {0}"
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr "No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo"
@@ -60876,7 +61019,7 @@ msgstr "No puedes editar el nodo raíz."
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr "No puede canjear más de {0}."
@@ -60908,7 +61051,7 @@ msgstr "No tienes permisos para {} elementos en un {}."
msgid "You don't have enough Loyalty Points to redeem"
msgstr "No tienes suficientes puntos de lealtad para canjear"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr "No tienes suficientes puntos para canjear."
@@ -61334,7 +61477,7 @@ msgstr "título"
msgid "to"
msgstr "a"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr ""
@@ -61374,7 +61517,7 @@ msgstr "{0}"
msgid "{0} '{1}' is disabled"
msgstr "{0} '{1}' está deshabilitado"
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr "{0} '{1}' no esta en el año fiscal {2}"
@@ -61406,7 +61549,7 @@ msgstr "Los cupones {0} utilizados son {1}. La cantidad permitida se agota"
msgid "{0} Digest"
msgstr "{0} Resumen"
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr "{0} Número {1} ya se usa en {2} {3}"
@@ -61422,7 +61565,7 @@ msgstr "{0} Solicitud de {1}"
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr "{0} Retener muestra se basa en el lote, marque Tiene número de lote para retener la muestra del artículo."
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr ""
@@ -61438,19 +61581,19 @@ msgstr ""
msgid "{0} account not found while submitting purchase receipt"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr "{0} contra la factura {1} de fecha {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr "{0} contra la orden de compra {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr "{0} contra la factura de ventas {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr "{0} contra la orden de ventas {1}"
@@ -61458,7 +61601,7 @@ msgstr "{0} contra la orden de ventas {1}"
msgid "{0} already has a Parent Procedure {1}."
msgstr "{0} ya tiene un Procedimiento principal {1}."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr "{0} y {1}"
@@ -61517,7 +61660,7 @@ msgstr "{0} se ingresó dos veces en impuesto del artículo"
msgid "{0} entered twice {1} in Item Taxes"
msgstr ""
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr "{0} de {1}"
@@ -61570,7 +61713,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr "{0} es obligatorio para el artículo {1}"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr ""
@@ -61645,7 +61788,7 @@ msgstr "{0} artículos producidos"
msgid "{0} must be negative in return document"
msgstr "{0} debe ser negativo en el documento de devolución"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr ""
@@ -61661,7 +61804,7 @@ msgstr "El parámetro {0} no es válido"
msgid "{0} payment entries can not be filtered by {1}"
msgstr "{0} entradas de pago no pueden ser filtradas por {1}"
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr ""
@@ -61722,7 +61865,7 @@ msgstr "{0} {1}"
msgid "{0} {1} Manually"
msgstr "{0} {1} Manualmente"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr "{0} {1} Parcialmente reconciliado"
@@ -61787,7 +61930,7 @@ msgstr "{0} {1} está cancelado o detenido"
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr "{0} {1} está cancelado por lo tanto la acción no puede ser completada"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr "{0} {1} está cerrado"
@@ -61799,7 +61942,7 @@ msgstr "{0} {1} está desactivado"
msgid "{0} {1} is frozen"
msgstr "{0} {1} está congelado"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr "{0} {1} está totalmente facturado"
@@ -61811,12 +61954,12 @@ msgstr "{0} {1} no está activo"
msgid "{0} {1} is not associated with {2} {3}"
msgstr "{0} {1} no está asociado con {2} {3}"
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr "{0} {1} no se ha validado"
@@ -61828,7 +61971,7 @@ msgstr ""
msgid "{0} {1} must be submitted"
msgstr "{0} {1} debe validarse"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr ""
@@ -61863,7 +62006,7 @@ msgstr "{0} {1}: la cuenta {2} está inactiva"
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr "{0} {1}: La entrada contable para {2} sólo puede hacerse en la moneda: {3}"
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr "{0} {1}: Centro de Costes es obligatorio para el artículo {2}"
@@ -61941,7 +62084,7 @@ msgstr "{doctype} {name} está cancelado o cerrado."
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr ""
@@ -61949,7 +62092,7 @@ msgstr ""
msgid "{ref_doctype} {ref_name} is {status}."
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr "{}"
@@ -62007,7 +62150,7 @@ msgstr ""
msgid "{} To Bill"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr "{} no se puede cancelar ya que se canjearon los puntos de fidelidad ganados. Primero cancele el {} No {}"
diff --git a/erpnext/locale/fa.po b/erpnext/locale/fa.po
index dcb960a22df..a16414bfa86 100644
--- a/erpnext/locale/fa.po
+++ b/erpnext/locale/fa.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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-05 16:06\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:06\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Persian\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr " آیتم"
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr "روزهای پس از آخرین سفارش باید بزرگتر یا
msgid "'Default {0} Account' in Company {1}"
msgstr "«حساب پیشفرض {0}» در شرکت {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr "«ثبتها» نمیتوانند خالی باشند"
@@ -857,11 +857,11 @@ msgstr "میانبرهای شما\n"
msgid "Your Shortcuts"
msgstr "میانبرهای شما"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr "جمع کل: {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr "مبلغ معوق: {0}"
@@ -1232,10 +1232,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1540,7 +1540,7 @@ msgstr "حساب {0}: حساب والد {1} وجود ندارد"
msgid "Account {0}: You can not assign itself as parent account"
msgstr "حساب {0}: شما نمیتوانید خود را به عنوان حساب والد اختصاص دهید"
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr "حساب: {0} یک کار سرمایه ای در حال انجام است و نمیتوان آن را با ثبت دفتر روزنامه به روز کرد"
@@ -2029,7 +2029,7 @@ msgstr "حسابها تا تاریخ مسدود شدهاند"
msgid "Accounts Manager"
msgstr "مدیر حسابداری"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr "خطای گم شدن حسابها"
@@ -2216,7 +2216,7 @@ msgstr "تنظیمات حسابها"
msgid "Accounts User"
msgstr "کاربر حسابداری"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr "جدول حسابها نمیتواند خالی باشد."
@@ -2576,6 +2576,10 @@ msgstr "زمان پایان واقعی"
msgid "Actual Expense"
msgstr "هزینه واقعی"
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr ""
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2713,7 +2717,7 @@ msgstr "افزودن / ویرایش قیمت ها"
msgid "Add Child"
msgstr "افزودن فرزند"
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr "افزودن ستون به ارز تراکنش"
@@ -3519,7 +3523,7 @@ msgstr "مبلغ پیشپرداخت"
msgid "Advance amount cannot be greater than {0} {1}"
msgstr "مبلغ پیشپرداخت نمیتواند بیشتر از {0} {1} باشد"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr "پیشپرداخت در مقابل {0} {1} نمیتواند بیشتر از جمع کل {2} باشد"
@@ -3576,7 +3580,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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr "در مقابل حساب"
@@ -3645,7 +3649,7 @@ msgstr "در مقابل حساب هزینه"
msgid "Against Income Account"
msgstr "در مقابل حساب درآمد"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr "در مقابل ثبت دفتر روزنامه {0} هیچ ثبت {1} تطبیقنیافتهای وجود ندارد"
@@ -3693,7 +3697,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr "در مقابل سند مالی"
@@ -3705,7 +3709,7 @@ msgstr "در مقابل سند مالی"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr "در مقابل سند مالی شماره"
@@ -3717,8 +3721,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr "در مقابل نوع سند مالی"
@@ -3844,7 +3848,7 @@ msgstr "همه"
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr "همه حسابها"
@@ -4012,7 +4016,7 @@ msgstr "همه آیتمها قبلا درخواست شده است"
msgid "All items have already been Invoiced/Returned"
msgstr "همه آیتمها قبلاً صورتحساب/بازگردانده شده اند"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr "همه آیتمها قبلاً دریافت شده است"
@@ -4028,7 +4032,7 @@ msgstr "همه آیتمها در این سند قبلاً دارای یک ب
#. in DocType 'CRM Settings'
#: erpnext/crm/doctype/crm_settings/crm_settings.json
msgid "All the Comments and Emails will be copied from one document to another newly created document(Lead -> Opportunity -> Quotation) throughout the CRM documents."
-msgstr "تمام نظرات و ایمیل ها از یک سند به سند جدید ایجاد شده دیگر (سرنخ -> فرصت -> پیش فاکتور) در سراسر اسناد CRM کپی میشوند."
+msgstr "تمام دیدگاهها و ایمیل ها از یک سند به سند جدید ایجاد شده دیگر (سرنخ -> فرصت -> پیش فاکتور) در سراسر اسناد CRM کپی میشوند."
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:200
msgid "All the items have been already returned."
@@ -4038,7 +4042,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:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr "همه این آیتمها قبلاً صورتحساب/بازگردانده شده اند"
@@ -4924,7 +4928,7 @@ msgstr "اصلاح شده از"
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5064,7 +5068,7 @@ msgstr "مبلغ در شکل"
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr "مبلغ به ارز حساب"
@@ -5215,7 +5219,7 @@ msgstr "رکورد بودجه دیگری \"{0}\" در برابر {1} \"{2}\" و
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr "یکی دیگر از رکوردهای تخصیص مرکز هزینه {0} قابل اعمال از {1}، بنابراین این تخصیص تا {2} قابل اعمال خواهد بود."
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr "درخواست پرداخت دیگری در حال حاضر پردازش شده است"
@@ -5798,7 +5802,7 @@ msgstr "آیتم موجودی سرمایه گذاری دارایی"
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5840,7 +5844,7 @@ msgstr "جدول استهلاک دارایی ها"
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr "برنامه استهلاک دارایی برای دارایی {0} و دفتر مالی {1} از استهلاک مبتنی بر شیفت استفاده نمیکند"
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr "برنامه استهلاک دارایی برای دارایی {0} و دفتر مالی {1} یافت نشد"
@@ -5879,7 +5883,7 @@ msgstr "واگذاری دارایی"
msgid "Asset Finance Book"
msgstr "دفتر مالی دارایی"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr "شناسه دارایی"
@@ -5955,7 +5959,7 @@ msgstr "رکورد جابجایی دارایی {0} ایجاد شد"
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr "نام دارایی"
@@ -6041,9 +6045,9 @@ msgstr "وضعیت دارایی"
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr "ارزش دارایی"
@@ -6072,7 +6076,7 @@ msgstr "دارایی لغو شد"
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "دارایی را نمیتوان لغو کرد، زیرا قبلاً {0} است"
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr "دارایی را نمیتوان قبل از آخرین ثبت استهلاک اسقاط کرد."
@@ -6104,7 +6108,7 @@ msgstr "دارایی از کار افتاده به دلیل تعمیر دارا
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr "دارایی در مکان {0} دریافت و برای کارمند {1} حواله شد"
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr "دارایی بازیابی شد"
@@ -6116,11 +6120,11 @@ msgstr "دارایی پس از لغو فرآیند سرمایهای کردن
msgid "Asset returned"
msgstr "دارایی برگردانده شد"
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr "دارایی اسقاط شده است"
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr "دارایی از طریق ثبت دفتر روزنامه {0} اسقاط شد"
@@ -6145,7 +6149,7 @@ msgstr "دارایی پس از تقسیم به دارایی {0} به روز شد
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr "دارایی {0} قابل اسقاط نیست، زیرا قبلاً {1} است"
@@ -6178,7 +6182,15 @@ msgstr "دارایی {0} به روز شده است. لطفاً جزئیات اس
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr "دارایی {0} در وضعیت {1} قرار دارد و قابل تعمیر نیست."
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr ""
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr "دارایی {0} باید ارسال شود"
@@ -6559,7 +6571,7 @@ msgstr "تطبیق خودکار"
msgid "Auto Reconcile Payments"
msgstr "تطبیق خودکار پرداختها"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr "تطبیق خودکار"
@@ -6569,7 +6581,7 @@ msgstr "تطبیق خودکار"
msgid "Auto Reconciliation Job Trigger"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr "تطبیق خودکار در پسزمینه شروع شده است"
@@ -6640,7 +6652,7 @@ msgstr "رزرو خودکار موجودی برای سفارش فروش در ه
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:156
msgid "Auto Tax Settings Error"
-msgstr ""
+msgstr "خطای تنظیمات مالیات خودکار"
#. Description of the 'Close Replied Opportunity After Days' (Int) field in
#. DocType 'CRM Settings'
@@ -6744,7 +6756,7 @@ msgstr "مقدار دسته موجود در انبار"
msgid "Available Batch Report"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr "تاریخ استفاده در دسترس است"
@@ -6973,7 +6985,7 @@ msgstr "BOM"
msgid "BOM 1"
msgstr "BOM 1"
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "BOM 1 {0} و BOM 2 {1} نباید یکسان باشند"
@@ -7211,23 +7223,23 @@ msgstr "BOM شامل هیچ آیتم موجودی نیست"
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr "بازگشت BOM: {0} نمیتواند فرزند {1} باشد"
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr "بازگشت BOM: {1} نمیتواند والد یا فرزند {0} باشد"
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr "BOM {0} به آیتم {1} تعلق ندارد"
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr "BOM {0} باید فعال باشد"
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr "BOM {0} باید ارسال شود"
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr "BOM {0} برای آیتم {1} یافت نشد"
@@ -7298,7 +7310,7 @@ msgstr "تراز"
msgid "Balance (Dr - Cr)"
msgstr "تراز (Dr - Cr)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr "تراز ({0})"
@@ -7777,7 +7789,7 @@ msgstr "نرخ پایه"
msgid "Base Tax Withholding Net Total"
msgstr "کل خالص کسر مالیات پایه"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr "مجموع پایه"
@@ -7982,7 +7994,9 @@ msgstr "وضعیت انقضای آیتم دسته"
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -7993,7 +8007,7 @@ msgstr "شماره دسته"
msgid "Batch No is mandatory"
msgstr "شماره دسته اجباری است"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr "شماره دسته {0} وجود ندارد"
@@ -8016,7 +8030,7 @@ msgstr "شماره دسته"
msgid "Batch Nos"
msgstr "شماره های دسته"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr "شماره های دسته با موفقیت ایجاد شد"
@@ -8029,7 +8043,7 @@ msgstr ""
msgid "Batch Number Series"
msgstr "سری شماره دسته"
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr "مقدار دسته"
@@ -8142,7 +8156,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8455,8 +8469,8 @@ msgstr "آیتم سفارش کلی"
msgid "Blanket Order Rate"
msgstr "نرخ سفارش کلی"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr "مسدود کردن فاکتور"
@@ -8572,7 +8586,7 @@ msgstr "دارایی ثابت رزرو شده"
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr "رزرو ارزش موجودی در چندین حساب، ردیابی موجودی و ارزش حساب را دشوارتر میکند."
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr "رزروها تا پایان دوره {0} بسته شدهاند"
@@ -9346,7 +9360,7 @@ msgstr "اگر بر اساس روش پرداخت گروه بندی شود، نم
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr "اگر بر اساس سند مالی گروه بندی شود، نمیتوان بر اساس شماره سند مالی فیلتر کرد"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr "فقط میتوانید با {0} پرداخت نشده انجام دهید"
@@ -9532,7 +9546,7 @@ msgstr "نمیتوان مسیر را بهینه کرد زیرا آدرس را
msgid "Cannot Relieve Employee"
msgstr "امکان برکناری کارمند وجود ندارد"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr "نمیتوان ثبتهای دفتر را برای اسناد مالی در سال مالی بسته شده دوباره ارسال کرد."
@@ -9548,6 +9562,10 @@ msgstr "نمیتوان TDS را در یک ثبت در مقابل چندین
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr "نمیتواند یک آیتم دارایی ثابت باشد زیرا دفتر موجودی ایجاد شده است."
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr ""
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr ""
@@ -9637,7 +9655,7 @@ msgstr ""
msgid "Cannot create root account."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr "نمیتوان BOM را غیرفعال یا لغو کرد زیرا با BOM های دیگر مرتبط است"
@@ -9654,7 +9672,7 @@ msgstr "وقتی دسته برای «ارزشگذاری» یا «ارزش
msgid "Cannot delete Exchange Gain/Loss row"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr "نمیتوان شماره سریال {0} را حذف کرد، زیرا در معاملات موجودی استفاده میشود"
@@ -9858,7 +9876,7 @@ msgstr "خدمات حامل"
#. DocType 'CRM Settings'
#: erpnext/crm/doctype/crm_settings/crm_settings.json
msgid "Carry Forward Communication and Comments"
-msgstr "انتقال ارتباطات و نظرات"
+msgstr "انتقال ارتباطات و دیدگاهها"
#. Option for the 'Account Type' (Select) field in DocType 'Account'
#. Option for the 'Type' (Select) field in DocType 'Mode of Payment'
@@ -10100,11 +10118,11 @@ msgstr "زنجیره"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr "تغییر مبلغ"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr "تاریخ انتشار را تغییر دهید"
@@ -10117,7 +10135,7 @@ msgstr "تاریخ انتشار را تغییر دهید"
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr "تغییر در ارزش موجودی"
@@ -10789,7 +10807,7 @@ msgstr "سهم ترکیبی فاکتور باید 100٪ باشد"
#: erpnext/utilities/doctype/video/video.json
#: erpnext/utilities/report/youtube_interactions/youtube_interactions.py:28
msgid "Comments"
-msgstr "نظرات"
+msgstr "دیدگاهها"
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:161
msgid "Commercial"
@@ -10925,6 +10943,7 @@ msgstr "شرکت ها"
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11072,6 +11091,7 @@ msgstr "شرکت ها"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11157,8 +11177,8 @@ msgstr "شرکت ها"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11474,7 +11494,7 @@ msgstr "شناسه مالیاتی شرکت"
msgid "Company and Posting Date is mandatory"
msgstr "شرکت و تاریخ ارسال الزامی است"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr "ارزهای شرکت هر دو شرکت باید برای معاملات بین شرکتی مطابقت داشته باشد."
@@ -12755,7 +12775,7 @@ 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12774,7 +12794,7 @@ msgstr "هزینه"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -12987,7 +13007,7 @@ msgstr "داده های نسخه ی نمایشی حذف نشد"
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr "به دلیل عدم وجود فیلد(های) الزامی زیر، امکان ایجاد خودکار مشتری وجود ندارد:"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr "یادداشت بستانکاری بهطور خودکار ایجاد نشد، لطفاً علامت «صدور یادداشت بستانکاری» را بردارید و دوباره ارسال کنید"
@@ -13110,15 +13130,15 @@ msgstr "بس"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13360,7 +13380,7 @@ msgstr "ایجاد فرصت"
msgid "Create POS Opening Entry"
msgstr "ایجاد ثبت افتتاحیه POS"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr "ایجاد ثبت پرداخت"
@@ -13516,7 +13536,7 @@ msgstr "ایجاد اکانت ..."
msgid "Creating Delivery Note ..."
msgstr "ایجاد یادداشت تحویل ..."
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr "ایجاد ابعاد..."
@@ -13536,7 +13556,7 @@ msgstr "ایجاد فاکتورهای خرید ..."
msgid "Creating Purchase Order ..."
msgstr "ایجاد سفارش خرید ..."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13573,11 +13593,6 @@ msgstr "ایجاد {} از {} {}"
msgid "Creation"
msgstr "ایجاد"
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr "شماره سند ایجاد"
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr "ایجاد {1}(ها) با موفقیت"
@@ -13610,11 +13625,11 @@ msgstr ""
msgid "Credit"
msgstr "بستانکار"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr "بستانکار (تراکنش)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr "بستانکار ({0})"
@@ -13757,7 +13772,7 @@ 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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr "یادداشت بستانکاری {0} به طور خودکار ایجاد شده است"
@@ -13965,7 +13980,7 @@ msgstr "پیمانه"
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14064,7 +14079,7 @@ msgstr "پس از ثبت نام با استفاده از ارزهای دیگر،
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr "واحد پول برای {0} باید {1} باشد"
@@ -14414,6 +14429,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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14441,6 +14457,10 @@ msgstr "مشتری / آیتم / گروه آیتم"
msgid "Customer / Lead Address"
msgstr "آدرس مشتری / سرنخ"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr ""
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14842,7 +14862,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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr "مشتری {0} به پروژه {1} تعلق ندارد"
@@ -15194,7 +15214,7 @@ msgstr "تاریخ صدور"
msgid "Date of Joining"
msgstr "تاریخ پیوستن"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr "تاریخ تراکنش"
@@ -15331,11 +15351,11 @@ msgstr "مدیر محترم سیستم"
msgid "Debit"
msgstr "بدهکار"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr "بدهکار (تراکنش)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr "بدهکار ({0})"
@@ -15409,7 +15429,7 @@ msgstr "بدهی به"
msgid "Debit To is required"
msgstr "بدهی به مورد نیاز است"
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr "بدهی و اعتبار برای {0} #{1} برابر نیست. تفاوت {2} است."
@@ -16476,7 +16496,7 @@ msgstr "دادههای نمایشی پاک شد"
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16551,9 +16571,9 @@ msgstr "استهلاک بر اساس تناسب روزانه"
msgid "Depreciate based on shifts"
msgstr "استهلاک بر اساس نوبت"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr "مبلغ مستهلک شده"
@@ -16609,6 +16629,14 @@ msgstr "ثبت استهلاک"
msgid "Depreciation Entry Posting Status"
msgstr "وضعیت ثبت استهلاک"
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr ""
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16617,7 +16645,7 @@ msgstr "وضعیت ثبت استهلاک"
msgid "Depreciation Expense Account"
msgstr "حساب هزینه استهلاک"
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr "حساب هزینه استهلاک باید یک حساب درآمد یا هزینه باشد."
@@ -17503,6 +17531,10 @@ msgstr "تاریخ تخفیف"
msgid "Discount Percentage"
msgstr "درصد تخفیف"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr ""
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr "درصد تخفیف در تراکنش"
@@ -17735,7 +17767,7 @@ msgstr "تنظیمات ارسال"
msgid "Disposal Date"
msgstr "تاریخ دفع"
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr ""
@@ -18015,7 +18047,7 @@ msgstr "اسناد"
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr "اسناد: {0} درآمد/هزینه معوق را برای آنها فعال کرده است. امکان ارسال مجدد وجود ندارد."
@@ -19054,7 +19086,7 @@ msgstr "خالی"
msgid "Ems(Pica)"
msgstr "امز (پیکا)"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr "برای رزرو موجودی جزئی، Allow Partial Reservation را در تنظیمات موجودی فعال کنید."
@@ -19405,7 +19437,7 @@ msgstr "یک نام برای عملیات وارد کنید، به عنوان م
msgid "Enter a name for this Holiday List."
msgstr "یک نام برای این لیست تعطیلات وارد کنید."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr "مبلغی را برای بازخرید وارد کنید."
@@ -19466,7 +19498,7 @@ msgstr "مقدار آیتمی را که از این صورتحساب مواد ت
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr "مبلغ {0} را وارد کنید."
@@ -19486,7 +19518,7 @@ msgid "Entity"
msgstr "موجودیت"
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19581,7 +19613,7 @@ msgstr "خطا در ارزیابی فرمول معیار"
msgid "Error in party matching for Bank Transaction {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr "خطا هنگام ارسال ثبتهای استهلاک"
@@ -19631,11 +19663,9 @@ msgstr "زمان و هزینه تخمینی"
msgid "Evaluation Period"
msgstr "دوره ارزیابی"
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
-msgstr "حتی فاکتورهایی با اعمال کسر مالیات بدون بررسی برای بررسی نقض آستانه تجمعی در نظر گرفته میشوند."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
+msgstr ""
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
@@ -19996,7 +20026,7 @@ msgstr "ارزش مورد انتظار پس از عمر مفید"
msgid "Expense"
msgstr "هزینه"
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr "حساب هزینه / تفاوت ({0}) باید یک حساب \"سود یا زیان\" باشد"
@@ -20041,7 +20071,7 @@ msgstr "حساب هزینه / تفاوت ({0}) باید یک حساب \"سود
msgid "Expense Account"
msgstr "حساب هزینه"
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr "حساب هزینه جا افتاده است"
@@ -20348,7 +20378,7 @@ msgstr "تاریخ شکست"
msgid "Failure Description"
msgstr "شرح شکست"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr "شکست: {0}"
@@ -21024,6 +21054,10 @@ msgstr "آیتم دارایی ثابت باید یک آیتم غیر موجود
msgid "Fixed Asset Register"
msgstr "ثبت دارایی های ثابت"
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21154,7 +21188,7 @@ msgstr "برای تامین کننده پیشفرض (اختیاری)"
msgid "For Item"
msgstr "برای آیتم"
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr ""
@@ -22046,7 +22080,7 @@ msgstr "مرجع پرداخت آینده"
msgid "Future Payments"
msgstr "پرداختهای آینده"
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr "تاریخ آینده مجاز نیست"
@@ -22062,7 +22096,7 @@ msgstr "تراز دفتر کل"
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr "ثبت در دفتر کل"
@@ -22328,8 +22362,8 @@ msgid "Get Items"
msgstr "دریافت آیتمها"
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22688,7 +22722,7 @@ msgstr "گرم/لیتر"
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22698,7 +22732,7 @@ msgstr "گرم/لیتر"
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22819,8 +22853,8 @@ msgstr "درصد سود ناخالص"
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr "مبلغ ناخالص خرید"
@@ -23171,7 +23205,7 @@ msgstr "هکتوپاسکال"
msgid "Height (cm)"
msgstr "ارتفاع (سانتی متر)"
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr "سلام،"
@@ -23210,7 +23244,7 @@ msgstr "متن راهنما"
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr "در اینجا گزارش های خطا برای ثبتهای استهلاک ناموفق فوق الذکر آمده است: {0}"
@@ -23306,7 +23340,7 @@ msgstr "منتظر گذاشتن"
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr "منتظر گذاشتن فاکتور"
@@ -23400,6 +23434,10 @@ msgstr "ساعت ها"
msgid "Hours Spent"
msgstr "ساعت های صرف شده"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr ""
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23737,6 +23775,10 @@ msgstr "در صورت ذکر شده، این سیستم فقط به کاربرا
msgid "If more than one package of the same type (for print)"
msgstr "اگر بیش از یک بسته از همان نوع (برای چاپ)"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr ""
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23753,6 +23795,10 @@ msgstr "اگر نه، میتوانید این ثبت را لغو / ارسال
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr "اگر نرخ صفر باشد، آیتم به عنوان \"آیتم رایگان\" تلقی میشود"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr ""
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23835,6 +23881,10 @@ msgstr "اگر علامت زده شود، میتوان از چندین ماد
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr "در صورت علامت زدن، هزینه BOM به طور خودکار بر اساس نرخ ارزشگذاری / نرخ لیست قیمت / آخرین نرخ خرید مواد اولیه به روز میشود."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr ""
@@ -23929,7 +23979,7 @@ msgstr "نادیده گرفتن موجودی خالی"
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -23981,7 +24031,7 @@ msgstr "نادیده گرفتن قانون قیمت گذاری فعال است.
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr "نادیده گرفتن یادداشت های بستانکاری / بدهکاری ایجاد شده توسط سیستم"
@@ -24744,7 +24794,7 @@ msgstr "تنظیمات تماس ورودی"
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24817,7 +24867,7 @@ msgstr "باندل سریال و دسته نادرست"
msgid "Incorrect Stock Value Report"
msgstr "گزارش ارزش موجودی نادرست است"
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr "نوع تراکنش نادرست"
@@ -24984,13 +25034,13 @@ msgstr "درج رکوردهای جدید"
msgid "Inspected By"
msgstr "بازرسی توسط"
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr "بازرسی رد شد"
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr "بازرسی مورد نیاز است"
@@ -25007,7 +25057,7 @@ msgstr "بازرسی قبل از تحویل لازم است"
msgid "Inspection Required before Purchase"
msgstr "بازرسی قبل از خرید الزامی است"
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr "ارسال بازرسی"
@@ -25037,7 +25087,7 @@ msgstr "یادداشت نصب"
msgid "Installation Note Item"
msgstr "آیتم یادداشت نصب"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr "یادداشت نصب {0} قبلا ارسال شده است"
@@ -25095,7 +25145,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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "موجودی ناکافی"
@@ -25286,7 +25336,7 @@ msgstr "نقل و انتقالات داخلی"
msgid "Internal Work History"
msgstr "سابقه کار داخلی"
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr "نقل و انتقالات داخلی فقط با ارز پیشفرض شرکت قابل انجام است"
@@ -25322,7 +25372,7 @@ msgid "Invalid Account"
msgstr "حساب نامعتبر"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr ""
@@ -25350,7 +25400,7 @@ msgstr "سفارش کلی نامعتبر برای مشتری و آیتم انت
msgid "Invalid Child Procedure"
msgstr "رویه فرزند نامعتبر"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr "شرکت نامعتبر برای معاملات بین شرکتی."
@@ -25408,7 +25458,7 @@ msgid "Invalid Ledger Entries"
msgstr "ثبتهای دفتر نامعتبر"
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr "ثبت افتتاحیه نامعتبر"
@@ -25436,7 +25486,7 @@ msgstr "نقش اصلی نامعتبر است"
msgid "Invalid Priority"
msgstr "اولویت نامعتبر است"
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr "پیکربندی هدررفت فرآیند نامعتبر است"
@@ -25454,7 +25504,7 @@ msgstr "مقدار نامعتبر"
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:435
msgid "Invalid Query"
-msgstr ""
+msgstr "پرسمان نامعتبر"
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:198
msgid "Invalid Return"
@@ -25520,8 +25570,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr "مقدار {0} برای {1} در برابر حساب {2} نامعتبر است"
@@ -25529,7 +25579,7 @@ msgstr "مقدار {0} برای {1} در برابر حساب {2} نامعتبر
msgid "Invalid {0}"
msgstr "{0} نامعتبر است"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr "{0} برای تراکنش بین شرکتی نامعتبر است."
@@ -25739,7 +25789,7 @@ msgstr "تعداد فاکتور"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26791,6 +26841,8 @@ msgstr ""
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26809,7 +26861,11 @@ msgstr "کد آیتم"
msgid "Item Code (Final Product)"
msgstr "کد آیتم (محصول نهایی)"
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr ""
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr "کد آیتم را نمیتوان برای شماره سریال تغییر داد."
@@ -27213,6 +27269,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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28133,7 +28190,7 @@ msgstr "ثبت دفتر روزنامه برای اسقاط"
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr "نوع ثبت دفتر روزنامه باید به عنوان ثبت استهلاک برای استهلاک دارایی تنظیم شود"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr "ثبت دفتر روزنامه {0} دارای حساب {1} نیست یا قبلاً با سند مالی دیگری مطابقت دارد"
@@ -28339,7 +28396,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29055,7 +29112,7 @@ msgstr "محلی"
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29726,7 +29783,7 @@ msgstr "بعد حسابداری اجباری"
msgid "Mandatory Depends On"
msgstr "اجباری بستگی دارد"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr "فیلد اجباری"
@@ -29816,6 +29873,7 @@ msgstr "ثبت دستی ایجاد نمیشود! ثبت خودکار برای
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30374,6 +30432,7 @@ msgid "Material Requested"
msgstr "مواد درخواستی"
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr "درخواست مواد"
@@ -30729,7 +30788,7 @@ msgstr "پیام"
msgid "Message Examples"
msgstr "نمونه های پیام"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr "پیام فرستاده شد"
@@ -31043,8 +31102,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr "حساب جا افتاده"
@@ -31062,6 +31121,10 @@ msgstr "مرکز هزینه جا افتاده"
msgid "Missing Default in Company"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr ""
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr "دفتر مالی جا افتاده"
@@ -31094,7 +31157,7 @@ msgstr "مقادیر از دست رفته الزامی است"
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr "الگوی ایمیل برای ارسال وجود ندارد. لطفاً یکی را در تنظیمات تحویل تنظیم کنید."
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr "مقدار از دست رفته"
@@ -31760,7 +31823,7 @@ msgstr "گاز طبیعی"
msgid "Needs Analysis"
msgstr "نیاز به تحلیل دارد"
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr ""
@@ -32192,7 +32255,7 @@ msgstr "سفارشهای فروش جدید"
msgid "New Sales Person Name"
msgstr "نام فروشنده جدید"
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr "شماره سریال جدید نمیتواند انبار داشته باشد. انبار باید با ورود به انبار یا رسید خرید تنظیم شود"
@@ -32228,7 +32291,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:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr "تاریخ انتشار جدید باید در آینده باشد"
@@ -32337,7 +32400,7 @@ msgstr "بدون اقدام"
msgid "No Answer"
msgstr "بدون پاسخ"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr "هیچ مشتری برای Inter Company Transactions که نماینده شرکت {0} است یافت نشد"
@@ -32394,9 +32457,9 @@ msgstr "هیچ صورتحساب معوقی برای این طرف یافت نش
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr "هیچ نمایه POS یافت نشد. لطفا ابتدا یک نمایه POS جدید ایجاد کنید"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr "بدون مجوز و اجازه"
@@ -32431,7 +32494,7 @@ msgstr "موجودی در حال حاضر موجود نیست"
msgid "No Summary"
msgstr "بدون خلاصه"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr "هیچ تامین کننده ای برای Inter Company Transactions یافت نشد که نماینده شرکت {0}"
@@ -32529,7 +32592,7 @@ msgstr "هیچ آیتمی در سبد خرید وجود ندارد"
msgid "No items to be received are overdue"
msgstr "هیچ موردی که باید دریافت شود دیر نشده است"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr "هیچ همخوانی ای از طریق تطبیق خودکار رخ نداد"
@@ -32663,11 +32726,11 @@ msgstr "هیچ تراکنش موجودیی را نمیتوان قبل از ا
msgid "No values"
msgstr "بدون ارزش"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr "هیچ حساب {0} برای این شرکت یافت نشد."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr "هیچ {0} برای معاملات بین شرکتی یافت نشد."
@@ -32702,7 +32765,7 @@ msgstr "دسته غیر استهلاک پذیر"
msgid "Non Profit"
msgstr "غیر انتفاعی"
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr "آیتمهای غیر موجودی"
@@ -32881,7 +32944,7 @@ msgstr ""
msgid "Note: Email will not be sent to disabled users"
msgstr "توجه: برای کاربران غیر فعال ایمیل ارسال نخواهد شد"
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr ""
@@ -32901,7 +32964,7 @@ msgstr "توجه: این مرکز هزینه یک گروه است. نمیتو
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr "توجه: برای ادغام آیتمها، یک تطبیق موجودی جداگانه برای آیتم قدیمی {0} ایجاد کنید"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr "توجه: {0}"
@@ -32917,6 +32980,7 @@ msgstr "توجه: {0}"
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33352,6 +33416,12 @@ msgstr "فقط گرههای برگ در تراکنش مجاز هستند"
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr "فقط یک ثبت {0} میتواند در برابر دستور کار {1} ایجاد شود"
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr ""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33433,7 +33503,7 @@ msgstr "Activity HTML را باز کنید"
#: erpnext/manufacturing/doctype/bom/bom_item_preview.html:21
msgid "Open BOM {0}"
-msgstr ""
+msgstr "باز کردن BOM {0}"
#: erpnext/public/js/templates/call_link.html:11
msgid "Open Call Log"
@@ -33468,7 +33538,7 @@ msgstr "مشکلات باز "
#: erpnext/manufacturing/doctype/bom/bom_item_preview.html:25
#: erpnext/manufacturing/doctype/work_order/work_order_preview.html:28
msgid "Open Item {0}"
-msgstr ""
+msgstr "باز کردن آیتم {0}"
#. Label of the notifications (Check) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
@@ -33554,8 +33624,8 @@ msgstr "افتتاحیه (بدهی)"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr "استهلاک انباشته افتتاحیه"
@@ -33597,7 +33667,7 @@ msgstr "تاریخ افتتاحیه"
msgid "Opening Entry"
msgstr "ثبت افتتاحیه"
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr "پس از ایجاد سند مالی اختتامیه دوره، ثبت افتتاحیه نمیتواند ایجاد شود."
@@ -33625,7 +33695,7 @@ msgid "Opening Invoice Item"
msgstr "باز شدن مورد فاکتور"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 ""
@@ -33699,7 +33769,7 @@ msgstr "هزینه عملیاتی (ارز شرکت)"
msgid "Operating Cost Per BOM Quantity"
msgstr "هزینه عملیاتی به ازای هر مقدار BOM"
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr "هزینه عملیاتی بر اساس دستور کار / BOM"
@@ -33855,7 +33925,7 @@ msgstr "عملیات"
msgid "Operations Routing"
msgstr "مسیریابی عملیات"
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr "عملیات را نمیتوان خالی گذاشت"
@@ -34447,7 +34517,7 @@ msgstr "اضافه تحویل/دریافت مجاز (%)"
msgid "Over Picking Allowance"
msgstr "اجازه برداشت بیش از حد"
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr "بیش از رسید"
@@ -34899,7 +34969,7 @@ msgstr "آیتم بسته بندی شده"
msgid "Packed Items"
msgstr "آیتمهای بسته بندی شده"
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr "آیتمهای بسته بندی شده را نمیتوان به صورت داخلی منتقل کرد"
@@ -34934,7 +35004,7 @@ msgstr "برگه بسته بندی"
msgid "Packing Slip Item"
msgstr "آیتم برگه بسته بندی"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr "برگه(های) بسته بندی لغو شد"
@@ -35020,7 +35090,7 @@ msgstr "پرداخت شده"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35295,7 +35365,7 @@ msgstr "مواد جزئی منتقل شد"
msgid "Partial Payment in POS Transactions are not allowed."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr "رزرو جزئی موجودی"
@@ -35489,9 +35559,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35652,9 +35722,9 @@ 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35819,7 +35889,7 @@ msgstr "تنظیمات پرداخت کننده"
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -35955,7 +36025,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr "ثبت پرداخت پس از اینکه شما آن را کشیدید اصلاح شده است. لطفا دوباره آن را بکشید."
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr "ثبت پرداخت قبلا ایجاد شده است"
@@ -36164,7 +36234,7 @@ msgstr "مراجع پرداخت"
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36190,11 +36260,11 @@ msgstr "نوع درخواست پرداخت"
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr "درخواست پرداخت ایجاد شده از سفارش فروش یا سفارش خرید در وضعیت پیشنویس خواهد بود. وقتی غیرفعال شود، سند در حالت ذخیره نشده خواهد بود."
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr "درخواست پرداخت برای {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr "درخواست پرداخت از قبل ایجاد شده است"
@@ -36352,7 +36422,7 @@ msgstr "آدرس اینترنتی پرداخت"
msgid "Payment Unlink Error"
msgstr "خطای لغو پیوند پرداخت"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr "پرداخت در مقابل {0} {1} نمیتواند بیشتر از مبلغ معوقه {2} باشد"
@@ -36673,7 +36743,7 @@ msgstr "دوره زمانی"
msgid "Period Based On"
msgstr "دوره بر اساس"
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr "دوره بسته است"
@@ -37276,7 +37346,7 @@ msgstr "لطفاً حساب را به شرکت سطح ریشه اضافه کنی
msgid "Please add {1} role to user {0}."
msgstr "لطفاً نقش {1} را به کاربر {0} اضافه کنید."
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr "لطفاً تعداد را تنظیم کنید یا برای ادامه {0} را ویرایش کنید."
@@ -37284,7 +37354,7 @@ msgstr "لطفاً تعداد را تنظیم کنید یا برای ادامه
msgid "Please attach CSV file"
msgstr "لطفا فایل CSV را پیوست کنید"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr "لطفاً ثبت پرداخت را لغو و اصلاح کنید"
@@ -37297,7 +37367,7 @@ msgstr "لطفاً ابتدا ثبت پرداخت را به صورت دستی ل
msgid "Please cancel related transaction."
msgstr "لطفا تراکنش مربوطه را لغو کنید."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr "لطفاً گزینه Multi Currency را علامت بزنید تا حساب با ارزهای دیگر مجاز باشد"
@@ -37374,7 +37444,7 @@ msgstr "لطفاً رسید خرید یا فاکتور خرید برای آیت
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr "لطفاً قبل از ادغام {1} در {2}، باندل محصول {0} را حذف کنید"
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr ""
@@ -37498,7 +37568,7 @@ msgstr "لطفا ابتدا رسید خرید را وارد کنید"
msgid "Please enter Receipt Document"
msgstr "لطفاً سند رسید را وارد کنید"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr "لطفا تاریخ مرجع را وارد کنید"
@@ -37623,8 +37693,8 @@ msgstr "لطفاً مطمئن شوید که واقعاً میخواهید ه
msgid "Please mention 'Weight UOM' along with Weight."
msgstr "لطفا \"UOM وزن\" را همراه با وزن ذکر کنید."
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr "لطفاً \"{0}\" را در شرکت: {1} ذکر کنید"
@@ -37752,7 +37822,7 @@ msgstr "لطفاً قبل از انتخاب طرف، تاریخ ارسال را
msgid "Please select Posting Date first"
msgstr "لطفا ابتدا تاریخ ارسال را انتخاب کنید"
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr "لطفا لیست قیمت را انتخاب کنید"
@@ -37784,7 +37854,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr "لطفا یک BOM را انتخاب کنید"
@@ -37874,15 +37944,19 @@ 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
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr ""
#: erpnext/manufacturing/doctype/work_order/work_order.js:355
msgid "Please select atleast one operation to create Job Card"
-msgstr ""
+msgstr "لطفا حداقل یک عملیات برای ایجاد کارت کار انتخاب کنید"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr "لطفا حساب صحیح را انتخاب کنید"
@@ -37963,15 +38037,15 @@ msgstr "لطفاً ابتدا {0} را انتخاب کنید"
msgid "Please set 'Apply Additional Discount On'"
msgstr "لطفاً \"اعمال تخفیف اضافی\" را تنظیم کنید"
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr "لطفاً \"مرکز هزینه استهلاک دارایی\" را در شرکت {0} تنظیم کنید"
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr "لطفاً «حساب سود/زیان در دفع دارایی» را در شرکت تنظیم کنید {0}"
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr "لطفاً \"{0}\" را در شرکت: {1} تنظیم کنید"
@@ -37979,7 +38053,7 @@ msgstr "لطفاً \"{0}\" را در شرکت: {1} تنظیم کنید"
msgid "Please set Account"
msgstr "لطفا حساب را تنظیم کنید"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr ""
@@ -38005,7 +38079,7 @@ msgstr "لطفاً بعد حسابداری {} را در {} تنظیم کنید"
msgid "Please set Company"
msgstr "لطفا شرکت را تنظیم کنید"
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr "لطفاً حسابهای مربوط به استهلاک را در دسته دارایی {0} یا شرکت {1} تنظیم کنید."
@@ -38023,7 +38097,7 @@ msgstr "لطفاً کد مالی را برای مشتری \"%s\" تنظیم کن
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr ""
@@ -38086,7 +38160,7 @@ msgstr "لطفاً حساب را در انبار {0} تنظیم کنید"
msgid "Please set an Address on the Company '%s'"
msgstr "لطفاً یک آدرس در شرکت \"%s\" تنظیم کنید"
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr "لطفاً یک حساب هزینه در جدول آیتمها تنظیم کنید"
@@ -38102,23 +38176,23 @@ msgstr "لطفاً حداقل یک ردیف در جدول مالیات ها و
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr "لطفاً شناسه مالیاتی و کد مالی شرکت {0} را تنظیم کنید"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr "لطفاً حساب پیشفرض نقدی یا بانکی را در حالت پرداخت تنظیم کنید {0}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr "لطفاً حساب پیشفرض نقدی یا بانکی را در حالت پرداخت تنظیم کنید {}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "لطفاً حساب پیشفرض نقدی یا بانکی را در حالت پرداخت تنظیم کنید {}"
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr "لطفاً حساب سود/زیان تبدیل پیشفرض را در شرکت تنظیم کنید {}"
@@ -38222,7 +38296,7 @@ msgstr ""
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr "لطفاً این ایمیل را با تیم پشتیبانی خود به اشتراک بگذارید تا آنها بتوانند مشکل را پیدا کرده و برطرف کنند."
@@ -38235,7 +38309,7 @@ msgid "Please specify Company"
msgstr "لطفا شرکت را مشخص کنید"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr "لطفاً شرکت را برای ادامه مشخص کنید"
@@ -38408,6 +38482,7 @@ msgstr "هزینه های پستی"
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38442,11 +38517,11 @@ 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38465,6 +38540,7 @@ msgstr "هزینه های پستی"
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38474,6 +38550,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_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
@@ -39039,6 +39116,14 @@ msgstr "کد مورد قانون قیمت گذاری"
msgid "Pricing Rule Item Group"
msgstr "گروه آیتم قوانین قیمت گذاری"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr ""
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr ""
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr "قانون قیمت گذاری {0} به روز شده است"
@@ -39097,6 +39182,10 @@ msgstr "قانون قیمت گذاری {0} به روز شده است"
msgid "Pricing Rules"
msgstr "قوانین قیمت گذاری"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr ""
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39484,7 +39573,7 @@ msgstr "شرح فرایند"
msgid "Process Loss"
msgstr "هدررفت فرآیند"
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr "درصد هدررفت فرآیند نمیتواند بیشتر از 100 باشد"
@@ -39974,7 +40063,7 @@ msgstr "پیشرفت (%)"
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40449,7 +40538,7 @@ msgstr "تجزیه و تحلیل خرید"
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr "تاریخ خرید"
@@ -40605,7 +40694,7 @@ msgstr "مدیر ارشد خرید"
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40781,9 +40870,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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -40968,11 +41057,11 @@ msgstr "ارزش خرید"
#: erpnext/stock/report/landed_cost_report/landed_cost_report.py:35
msgid "Purchase Voucher No"
-msgstr ""
+msgstr "شماره سند مالی خرید"
#: erpnext/stock/report/landed_cost_report/landed_cost_report.py:29
msgid "Purchase Voucher Type"
-msgstr ""
+msgstr "نوع سند مالی خرید"
#: erpnext/utilities/activation.py:105
msgid "Purchase orders help you plan and follow up on your purchases"
@@ -41664,6 +41753,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/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
@@ -41780,7 +41870,7 @@ msgstr "مقدار نباید بیشتر از {0} باشد"
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr "مقدار آیتم به دست آمده پس از تولید / بسته بندی مجدد از مقادیر معین مواد اولیه"
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr "مقدار مورد نیاز برای مورد {0} در ردیف {1}"
@@ -42452,11 +42542,11 @@ msgstr "ارزش مواد خام"
#: erpnext/stock/report/landed_cost_report/landed_cost_report.js:36
msgid "Raw Material Voucher No"
-msgstr ""
+msgstr "شماره سند مالی مواد اولیه"
#: erpnext/stock/report/landed_cost_report/landed_cost_report.js:30
msgid "Raw Material Voucher Type"
-msgstr ""
+msgstr "نوع سند مالی مواد اولیه"
#: erpnext/manufacturing/report/production_planning_report/production_planning_report.js:65
msgid "Raw Material Warehouse"
@@ -42629,7 +42719,7 @@ msgid "Reason"
msgstr "دلیل"
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "دلیل تعلیق"
@@ -43065,7 +43155,7 @@ msgstr "رستگاری در برابر"
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr "امتیازات وفاداری را بازخرید کنید"
@@ -43197,7 +43287,7 @@ msgstr "تاریخ مراجعه"
msgid "Reference"
msgstr "ارجاع"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr "مرجع #{0} به تاریخ {1}"
@@ -43335,7 +43425,7 @@ msgstr "نام مرجع"
msgid "Reference No"
msgstr "شماره مرجع"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr "شماره مرجع و تاریخ مرجع برای {0} مورد نیاز است"
@@ -43343,11 +43433,11 @@ msgstr "شماره مرجع و تاریخ مرجع برای {0} مورد نیا
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr "شماره مرجع و تاریخ مرجع برای تراکنش بانکی الزامی است"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr "اگر تاریخ مرجع را وارد کرده باشید، شماره مرجع اجباری است"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr "شماره مرجع."
@@ -43461,11 +43551,11 @@ msgstr "مرجع: {0}، کد مورد: {1} و مشتری: {2}"
msgid "References"
msgstr "منابع"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr ""
@@ -43610,8 +43700,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43630,7 +43720,7 @@ msgstr "تاریخ برکناری"
msgid "Remaining"
msgstr "باقی مانده است"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr "مبلغ باقی مانده"
@@ -43643,7 +43733,7 @@ msgstr "موجودی باقی مانده"
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr "ملاحظات"
@@ -43692,7 +43782,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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -44003,7 +44093,7 @@ msgstr "ارسال مجدد آیتمهای دفتر پرداخت"
msgid "Repost Status"
msgstr "وضعیت بازنشر"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr "ارسال مجدد در پس زمینه شروع شده است"
@@ -44327,7 +44417,7 @@ msgstr "اگر مخاطب انتخابی پس از ذخیره ویرایش شد
msgid "Reseller"
msgstr "نمایندگی فروش"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr "ارسال مجدد ایمیل پرداخت"
@@ -44796,7 +44886,7 @@ msgstr "برگشت"
msgid "Return / Credit Note"
msgstr "یادداشت برگشتی / بستانکاری"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr "یادداشت برگشتی / بدهکاری"
@@ -45320,12 +45410,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr "ردیف #۱: شناسه توالی برای عملیات {0} باید ۱ باشد."
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: 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/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "ردیف #{0} (جدول پرداخت): مبلغ باید مثبت باشد"
@@ -45471,7 +45561,7 @@ msgstr "ردیف #{0}: ورودی تکراری در منابع {1} {2}"
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr "ردیف #{0}: تاریخ تحویل مورد انتظار نمیتواند قبل از تاریخ سفارش خرید باشد"
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr "ردیف #{0}: حساب هزینه برای مورد {1} تنظیم نشده است. {2}"
@@ -45495,11 +45585,11 @@ msgstr "ردیف #{0}: کالای تمام شده باید {1} باشد"
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr "ردیف #{0}: مرجع کالای تمام شده برای آیتم ضایعات {1} اجباری است."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr "ردیف #{0}: برای {1}، فقط در صورتی میتوانید سند مرجع را انتخاب کنید که حساب اعتبار شود"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr "ردیف #{0}: برای {1}، فقط در صورتی میتوانید سند مرجع را انتخاب کنید که حساب بدهکار شود"
@@ -45519,7 +45609,7 @@ msgstr "ردیف #{0}: مورد اضافه شد"
msgid "Row #{0}: Item {1} does not exist"
msgstr "ردیف #{0}: مورد {1} وجود ندارد"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr "ردیف #{0}: مورد {1} انتخاب شده است، لطفاً موجودی را از فهرست انتخاب رزرو کنید."
@@ -45555,7 +45645,7 @@ msgstr ""
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:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr "ردیف #{0}: فقط {1} برای رزرو مورد {2} موجود است"
@@ -45600,15 +45690,15 @@ msgstr "ردیف #{0}: تعداد باید یک عدد مثبت باشد"
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} برای Iem {2} در مقابل دسته {3} در انبار {4} باشد."
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr "ردیف #{0}: بازرسی کیفیت {1} برای آیتم ارسال نشده است: {2}"
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr ""
@@ -45617,7 +45707,7 @@ msgstr ""
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "ردیف #{0}: مقدار آیتم {1} نمیتواند صفر باشد."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr "ردیف #{0}: مقدار قابل رزرو برای مورد {1} باید بیشتر از 0 باشد."
@@ -45711,19 +45801,19 @@ msgstr "ردیف #{0}: وضعیت باید {1} برای تخفیف فاکتور
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
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:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr "ردیف #{0}: موجودی در انبار گروهی {1} قابل رزرو نیست."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr "ردیف #{0}: موجودی قبلاً برای مورد {1} رزرو شده است."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr "ردیف #{0}: موجودی برای کالای {1} در انبار {2} رزرو شده است."
@@ -45731,8 +45821,8 @@ msgstr "ردیف #{0}: موجودی برای کالای {1} در انبار {2}
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr "ردیف #{0}: موجودی برای رزرو مورد {1} در انبار {2} موجود نیست."
@@ -45913,7 +46003,7 @@ msgstr "ردیف {0}# آیتم {1} در جدول «مواد خام تامین ش
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr "ردیف {0}: تعداد پذیرفته شده و تعداد رد شده نمیتوانند همزمان صفر باشند."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr "ردیف {0}: حساب {1} و نوع طرف {2} انواع مختلف حساب دارند"
@@ -45921,11 +46011,11 @@ msgstr "ردیف {0}: حساب {1} و نوع طرف {2} انواع مختلف ح
msgid "Row {0}: Activity Type is mandatory."
msgstr "ردیف {0}: نوع فعالیت اجباری است."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr "ردیف {0}: پیشپرداخت در برابر مشتری باید بستانکار باشد"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr "ردیف {0}: پیشپرداخت در مقابل تامین کننده باید بدهکار باشد"
@@ -45945,7 +46035,7 @@ msgstr ""
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr "ردیف {0}: صورتحساب مواد برای آیتم {1} یافت نشد"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr "ردیف {0}: هر دو مقدار بدهی و اعتبار نمیتوانند صفر باشند"
@@ -45961,7 +46051,7 @@ msgstr "ردیف {0}: مرکز هزینه {1} به شرکت {2} تعلق ندا
msgid "Row {0}: Cost center is required for an item {1}"
msgstr "ردیف {0}: مرکز هزینه برای یک مورد {1} لازم است"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr "ردیف {0}: ثبت بستانکار را نمیتوان با {1} پیوند داد"
@@ -45969,7 +46059,7 @@ msgstr "ردیف {0}: ثبت بستانکار را نمیتوان با {1} پ
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr "ردیف {0}: واحد پول BOM #{1} باید برابر با ارز انتخابی {2} باشد."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr "ردیف {0}: ورودی بدهی را نمیتوان با یک {1} پیوند داد"
@@ -45985,7 +46075,7 @@ msgstr "ردیف {0}: تاریخ سررسید در جدول شرایط پردا
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr "ردیف {0}: مرجع مورد یادداشت تحویل یا کالای بسته بندی شده اجباری است."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "ردیف {0}: نرخ ارز اجباری است"
@@ -46019,7 +46109,7 @@ msgstr "ردیف {0}: از زمان و تا زمان اجباری است."
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr "ردیف {0}: از زمان و تا زمان {1} با {2} همپوشانی دارد"
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr "ردیف {0}: از انبار برای نقل و انتقالات داخلی اجباری است"
@@ -46031,7 +46121,7 @@ msgstr "ردیف {0}: از زمان باید کمتر از زمان باشد"
msgid "Row {0}: Hours value must be greater than zero."
msgstr "ردیف {0}: مقدار ساعت باید بزرگتر از صفر باشد."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr "ردیف {0}: مرجع نامعتبر {1}"
@@ -46055,7 +46145,7 @@ msgstr "ردیف {0}: آیتم {1} باید یک آیتم قرارداد فرع
msgid "Row {0}: Item {1}'s quantity cannot be higher than the available quantity."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr "ردیف {0}: تعداد بسته بندی شده باید برابر با {1} تعداد باشد."
@@ -46063,7 +46153,7 @@ msgstr "ردیف {0}: تعداد بسته بندی شده باید برابر ب
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr "ردیف {0}: برگه بسته بندی قبلاً برای مورد {1} ایجاد شده است."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr "ردیف {0}: طرف / حساب با {1} / {2} در {3} {4} مطابقت ندارد"
@@ -46075,11 +46165,11 @@ msgstr "ردیف {0}: نوع طرف و طرف برای حساب دریافتنی
msgid "Row {0}: Payment Term is mandatory"
msgstr "ردیف {0}: مدت پرداخت اجباری است"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr "ردیف {0}: پرداخت در برابر سفارش فروش/خرید باید همیشه به عنوان پیشپرداخت علامت گذاری شود"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr "ردیف {0}: اگر این یک ثبت پیشپرداخت است، لطفاً «پیشپرداخت است» را در مقابل حساب {1} علامت بزنید."
@@ -46147,7 +46237,7 @@ msgstr "ردیف {0}: Shift را نمیتوان تغییر داد زیرا ا
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr "ردیف {0}: آیتم قرارداد فرعی شده برای مواد خام اجباری است {1}"
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr "ردیف {0}: انبار هدف برای نقل و انتقالات داخلی اجباری است"
@@ -46171,7 +46261,7 @@ msgstr "ردیف {0}: برای تنظیم تناوب {1}، تفاوت بین ت
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "ردیف {0}: ضریب تبدیل UOM اجباری است"
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: 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} اجباری است"
@@ -46192,7 +46282,7 @@ msgstr "ردیف {0}: {1} باید بزرگتر از 0 باشد"
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr "ردیف {0}: {1} {2} نمیتواند مانند {3} (حساب طرف) {4}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr "ردیف {0}: {1} {2} با {3} مطابقت ندارد"
@@ -46585,7 +46675,7 @@ msgstr "فاکتور فروش توسط کاربر {} ایجاد نشده است"
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr "فاکتور فروش {0} قبلا ارسال شده است"
@@ -46814,7 +46904,7 @@ msgstr "وضعیت سفارش فروش"
msgid "Sales Order Trends"
msgstr "روند سفارش فروش"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr "سفارش فروش برای آیتم {0} لازم است"
@@ -47324,8 +47414,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47596,7 +47686,7 @@ msgstr "هزینه مواد قراضه (ارز شرکت)"
msgid "Scrap Warehouse"
msgstr "انبار ضایعات"
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr "تاریخ اسقاط نمیتواند قبل از تاریخ خرید باشد"
@@ -47669,7 +47759,7 @@ msgstr "منشی"
msgid "Section"
msgstr "بخش"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr "کد بخش"
@@ -47755,7 +47845,7 @@ msgstr "انتخاب برند..."
#: erpnext/edi/doctype/code_list/code_list_import.js:109
msgid "Select Columns and Filters"
-msgstr ""
+msgstr "انتخاب ستونها و فیلترها"
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:132
msgid "Select Company"
@@ -48040,7 +48130,7 @@ msgstr "انتخاب کنید تا مشتری با این فیلدها قابل
msgid "Selected POS Opening Entry should be open."
msgstr "ثبت افتتاحیه POS انتخاب شده باید باز باشد."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr "لیست قیمت انتخاب شده باید دارای فیلدهای خرید و فروش باشد."
@@ -48224,7 +48314,7 @@ msgstr "ارسال با پیوست"
msgid "Sender"
msgstr "فرستنده"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr "در حال ارسال"
@@ -48348,7 +48438,9 @@ msgstr "شماره های سریال / دسته ای"
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48379,7 +48471,9 @@ msgid "Serial No Count"
msgstr "شمارش شماره سریال"
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr "دفتر شماره سریال"
@@ -48387,7 +48481,7 @@ msgstr "دفتر شماره سریال"
msgid "Serial No Range"
msgstr "محدوده شماره سریال"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr "شماره سریال رزرو شده"
@@ -48427,6 +48521,13 @@ msgstr "شماره سریال و دسته"
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr "انتخابگر شماره سریال و دسته زمانی که فیلدهای شماره سریال / دسته فعال شدهاند، قابل استفاده نیست."
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr ""
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr "شماره سریال اجباری است"
@@ -48456,7 +48557,7 @@ msgstr "شماره سریال {0} به آیتم {1} تعلق ندارد"
msgid "Serial No {0} does not exist"
msgstr "شماره سریال {0} وجود ندارد"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr "شماره سریال {0} وجود ندارد"
@@ -48505,7 +48606,7 @@ msgstr "شماره های سریال / شماره های دسته ای"
msgid "Serial Nos and Batches"
msgstr "شماره های سریال و دسته ها"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr "شماره های سریال با موفقیت ایجاد شد"
@@ -48583,11 +48684,11 @@ msgstr "سریال و دسته"
msgid "Serial and Batch Bundle"
msgstr "باندل سریال و دسته"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr "باندل سریال و دسته ایجاد شد"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr "باندل سریال و دسته به روز شد"
@@ -49021,7 +49122,7 @@ msgstr "تنظیم بهای تمامشده در مقصد بر اساس نرخ
msgid "Set Loyalty Program"
msgstr "تنظیم برنامه وفاداری"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr "تاریخ انتشار جدید را تنظیم کنید"
@@ -49276,7 +49377,7 @@ msgstr "تنظیم حساب بهعنوان حساب شرکت برای تطب
msgid "Setting up company"
msgstr "راهاندازی شرکت"
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr "تنظیم {0} الزامی است"
@@ -49460,7 +49561,7 @@ msgstr "نوع حمل و نقل"
msgid "Shipment details"
msgstr "جزئیات حمل و نقل"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr "محموله ها"
@@ -49707,6 +49808,10 @@ msgstr "نمایش ثبتهای لغو شده"
msgid "Show Completed"
msgstr "نمایش کامل شد"
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr ""
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr "نمایش مبلغ تجمعی"
@@ -49791,7 +49896,7 @@ msgstr "نمایش ثبتهای افتتاحیه"
#: erpnext/accounts/report/cash_flow/cash_flow.js:26
msgid "Show Opening and Closing Balance"
-msgstr ""
+msgstr "نمایش تراز افتتاحیه و اختتامیه"
#. Label of the show_operations (Check) field in DocType 'BOM'
#: erpnext/manufacturing/doctype/bom/bom.json
@@ -49822,7 +49927,7 @@ msgstr "نمایش پیش نمایش"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr "نمایش ملاحظات"
@@ -50127,13 +50232,27 @@ msgstr "منبع"
msgid "Source DocType"
msgstr "منبع DocType"
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr ""
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr "نام سند منبع"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr ""
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr "نوع سند منبع"
@@ -50204,7 +50323,7 @@ msgstr "آدرس انبار منبع"
msgid "Source Warehouse Address Link"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr "انبار منبع برای آیتم {0} اجباری است."
@@ -50715,7 +50834,7 @@ msgstr "ایالت/استان"
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51058,7 +51177,7 @@ msgstr "ثبت موجودی {0} ایجاد شد"
msgid "Stock Entry {0} has created"
msgstr "ثبت موجودی {0} ایجاد شد"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr "ثبت موجودی {0} ارسال نشده است"
@@ -51281,13 +51400,13 @@ msgstr "تنظیمات ارسال مجدد موجودی"
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51296,13 +51415,13 @@ msgstr "تنظیمات ارسال مجدد موجودی"
msgid "Stock Reservation"
msgstr "رزرو موجودی"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr "ثبتهای رزرو موجودی لغو شد"
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr "نوشته های رزرو موجودی ایجاد شد"
@@ -51324,7 +51443,7 @@ msgstr "ثبت رزرو موجودی قابل بهروزرسانی نیست
msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr "ثبت رزرو موجودی ایجاد شده در برابر لیست انتخاب نمیتواند به روز شود. اگر نیاز به ایجاد تغییرات دارید، توصیه میکنیم ثبت موجود را لغو کنید و یک ثبت جدید ایجاد کنید."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr "عدم تطابق انبار رزرو انبار"
@@ -51569,7 +51688,7 @@ msgstr "موجودی و تولید"
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr "موجودی در انبار گروهی {0} قابل رزرو نیست."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr "موجودی در انبار گروهی {0} قابل رزرو نیست."
@@ -51585,7 +51704,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr "موجودی برای دستور کار {0} لغو رزرو شده است."
@@ -52453,10 +52572,15 @@ 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "تامین کننده"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr ""
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52569,7 +52693,7 @@ msgstr "فاکتور تامین کننده"
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr "تاریخ فاکتور تامین کننده"
@@ -52583,8 +52707,8 @@ 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "شماره فاکتور تامین کننده"
@@ -53131,16 +53255,16 @@ msgstr "سیستم صورتحساب را بررسی نمیکند زیرا م
msgid "System will notify to increase or decrease quantity or amount "
msgstr "سیستم برای افزایش یا کاهش مقدار یا مبلغ اطلاع خواهد داد "
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr ""
@@ -53157,7 +53281,7 @@ msgstr ""
msgid "TDS Payable"
msgstr "TDS قابل پرداخت"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr ""
@@ -53713,7 +53837,7 @@ msgstr "نوع مالیات"
msgid "Tax Withheld Vouchers"
msgstr "اسناد مالی مالیات کسر شده"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr "کسر مالیات"
@@ -54338,7 +54462,7 @@ msgstr "دسترسی به درخواست پیش فاکتور از پورتال
msgid "The BOM which will be replaced"
msgstr "BOM که جایگزین خواهد شد"
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr ""
@@ -54366,7 +54490,7 @@ msgstr "ثبتهای دفتر کل در پسزمینه لغو میشو
msgid "The Loyalty Program isn't valid for the selected company"
msgstr "برنامه وفاداری برای شرکت انتخابی معتبر نیست"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr "درخواست پرداخت {0} قبلاً پرداخت شده است، نمیتوان پرداخت را دو بار پردازش کرد"
@@ -54390,7 +54514,7 @@ msgstr ""
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr "شماره سریال ردیف #{0}: {1} در انبار {2} موجود نیست."
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr ""
@@ -54412,7 +54536,7 @@ msgstr "دستور کار برای دستور دمونتاژ الزامی است
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr "سرفصل حساب تحت بدهی یا حقوق صاحبان موجودی، که در آن سود/زیان ثبت خواهد شد"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr ""
@@ -54453,7 +54577,7 @@ msgstr "فیلد From Shareholder نمیتواند خالی باشد"
msgid "The field To Shareholder cannot be blank"
msgstr "فیلد To Shareholder نمیتواند خالی باشد"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr ""
@@ -54469,7 +54593,7 @@ msgstr "اعداد برگ مطابقت ندارند"
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr "موارد زیر که دارای قوانین Putaway هستند، قابل استفاده نیستند:"
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr "دارایی های زیر به طور خودکار ثبتهای استهلاک را پست نکرده اند: {0}"
@@ -54730,6 +54854,10 @@ msgstr "{0} {1} با {0} {2} در {3} {4} مطابقت ندارد"
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr "{0} {1} برای محاسبه هزینه ارزیابی کالای نهایی {2} استفاده میشود."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr "تعمیر و نگهداری یا تعمیرات فعال در برابر دارایی وجود دارد. قبل از لغو دارایی، باید همه آنها را تکمیل کنید."
@@ -54996,7 +55124,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr "این برنامه زمانی ایجاد شد که دارایی {0} در لغو دارایی با حروف بزرگ {1} بازیابی شد."
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr "این برنامه زمانی ایجاد شد که دارایی {0} بازیابی شد."
@@ -55004,7 +55132,7 @@ msgstr "این برنامه زمانی ایجاد شد که دارایی {0} ب
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr "این برنامه زمانی ایجاد شد که دارایی {0} از طریق فاکتور فروش {1} برگردانده شد."
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr "این برنامه زمانی ایجاد شد که دارایی {0} اسقاط شد."
@@ -55779,6 +55907,10 @@ msgstr "برای گنجاندن مالیات در ردیف {0} در نرخ مو
msgid "To merge, following properties must be same for both items"
msgstr "برای ادغام، ویژگی های زیر باید برای هر دو مورد یکسان باشد"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr "برای لغو این مورد، \"{0}\" را در شرکت {1} فعال کنید"
@@ -55796,7 +55928,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr "برای ارسال فاکتور بدون رسید خرید، لطفاً {0} را به عنوان {1} در {2} تنظیم کنید."
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr "برای استفاده از یک دفتر مالی متفاوت، لطفاً علامت «شامل داراییهای پیشفرض FB» را بردارید."
@@ -56018,7 +56150,7 @@ msgstr "مجموع تخصیص ها"
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56180,7 +56312,7 @@ msgstr "مجموع مبلغ اعتبار/ بدهی باید مانند ثبت د
msgid "Total Debit"
msgstr "کل بدهکاری"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr "کل بدهی باید برابر با کل اعتبار باشد. تفاوت {0} است"
@@ -56773,6 +56905,10 @@ msgstr "جمع"
msgid "Traceability"
msgstr "قابلیت ردیابی"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr ""
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56813,7 +56949,7 @@ msgstr "URL پیگیری"
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -56911,7 +57047,7 @@ msgstr "تنظیمات تراکنش"
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr "نوع تراکنش"
@@ -56933,7 +57069,7 @@ msgstr "شماره مرجع تراکنش {0} به تاریخ {1}"
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57530,7 +57666,11 @@ msgstr "مبلغ تخصیص نیافته"
msgid "Unassigned Qty"
msgstr "تعداد تعیین نشده"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr "رفع انسداد فاکتور"
@@ -58890,14 +59030,14 @@ msgstr "ارزش خودرو"
#: erpnext/stock/doctype/landed_cost_vendor_invoice/landed_cost_vendor_invoice.json
#: erpnext/stock/report/landed_cost_report/landed_cost_report.py:42
msgid "Vendor Invoice"
-msgstr ""
+msgstr "فاکتور فروشنده"
#. Label of the vendor_invoices (Table) field in DocType 'Landed Cost Voucher'
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
msgid "Vendor Invoices"
-msgstr ""
+msgstr "فاکتورهای فروشنده"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr "نام فروشنده"
@@ -58964,7 +59104,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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59155,11 +59295,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59194,7 +59334,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr "زیرنوع سند مالی"
@@ -59226,9 +59366,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59247,6 +59387,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_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
@@ -59456,6 +59597,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_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
@@ -59564,7 +59706,7 @@ msgstr "انبار و مرجع"
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr "انبار را نمیتوان حذف کرد زیرا ثبت دفتر انبار برای این انبار وجود دارد."
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr "انبار برای شماره سریال قابل تغییر نیست."
@@ -59577,7 +59719,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:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr "انبار مورد نیاز برای موجودی مورد {0}"
@@ -59728,7 +59870,7 @@ msgstr "هشدار در مورد موجودی منفی"
msgid "Warning!"
msgstr "هشدار!"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr "هشدار: یک {0} # {1} دیگر در برابر ثبت موجودی {2} وجود دارد"
@@ -60211,6 +60353,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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "دستور کار"
@@ -60686,7 +60829,7 @@ msgstr "شما در حال درونبرد داده ها برای لیست ک
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr "شما مجاز به بهروزرسانی طبق شرایط تنظیم شده در {} گردش کار نیستید."
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr "شما مجاز به افزودن یا بهروزرسانی ورودیها قبل از {0} نیستید"
@@ -60718,7 +60861,7 @@ msgstr "همچنین میتوانید حساب پیشفرض «کارهای
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr "میتوانید حساب مادر را به حساب ترازنامه تغییر دهید یا حساب دیگری را انتخاب کنید."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr "شما نمیتوانید سند مالی فعلی را در ستون \"در مقابل ثبت دفتر روزنامه\" وارد کنید"
@@ -60735,7 +60878,7 @@ msgstr "در این سفارش فقط میتوانید حداکثر {0} ام
msgid "You can only select one mode of payment as default"
msgstr "شما فقط میتوانید یک روش پرداخت را به عنوان پیشفرض انتخاب کنید"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr "میتوانید حداکثر تا {0} مطالبه کنید."
@@ -60767,11 +60910,11 @@ msgstr "شما نمیتوانید یک {0} در دوره حسابداری ب
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr "شما نمیتوانید هیچ ورودی حسابداری را در دوره حسابداری بسته شده ایجاد یا لغو کنید {0}"
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr "تا این تاریخ نمیتوانید هیچ ثبت حسابداری ایجاد/اصلاح کنید."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr "شما نمیتوانید یک حساب را همزمان اعتبار و بدهی کنید"
@@ -60787,7 +60930,7 @@ msgstr "شما نمیتوانید گره ریشه را ویرایش کنید.
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr "شما نمیتوانید بیش از {0} را بازخرید کنید."
@@ -60819,7 +60962,7 @@ msgstr "شما مجوز {} مورد در {} را ندارید."
msgid "You don't have enough Loyalty Points to redeem"
msgstr "امتیاز وفاداری کافی برای پسخرید ندارید"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr "امتیاز کافی برای بازخرید ندارید."
@@ -60966,7 +61109,7 @@ msgstr "بر اساس"
#: erpnext/edi/doctype/code_list/code_list_import.js:90
msgid "by {}"
-msgstr ""
+msgstr "توسط {}"
#: erpnext/public/js/utils/sales_common.js:313
msgid "cannot be greater than 100"
@@ -61245,7 +61388,7 @@ msgstr "عنوان"
msgid "to"
msgstr "به"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr "برای تخصیص مبلغ این فاکتور برگشتی قبل از لغو آن."
@@ -61285,7 +61428,7 @@ msgstr "{0}"
msgid "{0} '{1}' is disabled"
msgstr "{0} \"{1}\" غیرفعال است"
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr "{0} «{1}» در سال مالی {2} نیست"
@@ -61317,7 +61460,7 @@ msgstr "{0} کوپن استفاده شده {1} است. مقدار مجاز تم
msgid "{0} Digest"
msgstr "{0} خلاصه"
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr "{0} شماره {1} قبلاً در {2} {3} استفاده شده است"
@@ -61333,7 +61476,7 @@ msgstr "درخواست {0} برای {1}"
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr "{0} نگهداری نمونه بر اساس دسته است، لطفاً برای نگهداری نمونه آیتم، شماره دسته را بررسی کنید"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr "{0} تراکنش(های) تطبیق شد"
@@ -61349,19 +61492,19 @@ msgstr "حساب {0} از نوع {1} نیست"
msgid "{0} account not found while submitting purchase receipt"
msgstr "هنگام ارسال رسید خرید، حساب {0} پیدا نشد"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr "{0} در برابر لایحه {1} مورخ {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr "{0} در مقابل سفارش خرید {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr "{0} در برابر فاکتور فروش {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr "{0} در برابر سفارش فروش {1}"
@@ -61369,7 +61512,7 @@ msgstr "{0} در برابر سفارش فروش {1}"
msgid "{0} already has a Parent Procedure {1}."
msgstr "{0} در حال حاضر یک رویه والد {1} دارد."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr "{0} و {1}"
@@ -61428,7 +61571,7 @@ msgstr "{0} دو بار در مالیات آیتم وارد شد"
msgid "{0} entered twice {1} in Item Taxes"
msgstr "{0} دو بار {1} در مالیات آیتم وارد شد"
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr "{0} برای {1}"
@@ -61481,7 +61624,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr "{0} برای آیتم {1} اجباری است"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr "{0} برای حساب {1} اجباری است"
@@ -61556,7 +61699,7 @@ msgstr "{0} آیتم تولید شد"
msgid "{0} must be negative in return document"
msgstr "{0} باید در سند برگشتی منفی باشد"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr "{0} مجاز به معامله با {1} نیست. لطفاً شرکت را تغییر دهید یا شرکت را در بخش \"مجاز برای معامله با\" در رکورد مشتری اضافه کنید."
@@ -61572,7 +61715,7 @@ msgstr "پارامتر {0} نامعتبر است"
msgid "{0} payment entries can not be filtered by {1}"
msgstr "{0} ثبتهای پرداخت را نمیتوان با {1} فیلتر کرد"
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr "{0} تعداد مورد {1} در انبار {2} با ظرفیت {3} در حال دریافت است."
@@ -61633,7 +61776,7 @@ msgstr "{0} {1}"
msgid "{0} {1} Manually"
msgstr "{0} {1} به صورت دستی"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr "{0} {1} تا حدی تطبیق کرد"
@@ -61698,7 +61841,7 @@ msgstr "{0} {1} لغو یا متوقف شده است"
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr "{0} {1} لغو شده است بنابراین عمل نمیتواند تکمیل شود"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr "{0} {1} بسته است"
@@ -61710,7 +61853,7 @@ msgstr "{0} {1} غیرفعال است"
msgid "{0} {1} is frozen"
msgstr "{0} {1} ثابت است"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr "{0} {1} به طور کامل صورتحساب دارد"
@@ -61722,12 +61865,12 @@ msgstr "{0} {1} فعال نیست"
msgid "{0} {1} is not associated with {2} {3}"
msgstr "{0} {1} با {2} {3} مرتبط نیست"
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr "{0} {1} در هیچ سال مالی فعالی نیست"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr "{0} {1} ارسال نشده است"
@@ -61739,7 +61882,7 @@ msgstr "{0} {1} در انتظار است"
msgid "{0} {1} must be submitted"
msgstr "{0} {1} باید ارسال شود"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr "{0} {1} مجاز به ارسال مجدد نیست. برای فعال کردن ارسال مجدد، {2} را تغییر دهید."
@@ -61774,7 +61917,7 @@ msgstr "{0} {1}: حساب {2} غیرفعال است"
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr "{0} {1}: ورود حسابداری برای {2} فقط به ارز انجام میشود: {3}"
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr "{0} {1}: مرکز هزینه برای مورد {2} اجباری است"
@@ -61852,7 +61995,7 @@ msgstr "{doctype} {name} لغو یا بسته شدهه است."
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr "{field_label} برای قراردادهای فرعی {doctype} اجباری است."
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr "اندازه نمونه {item_name} ({sample_size}) نمیتواند بیشتر از مقدار مورد قبول ({accepted_quantity}) باشد."
@@ -61860,7 +62003,7 @@ msgstr "اندازه نمونه {item_name} ({sample_size}) نمیتواند
msgid "{ref_doctype} {ref_name} is {status}."
msgstr "{ref_doctype} {ref_name} {status} است."
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr "{}"
@@ -61918,7 +62061,7 @@ msgstr "{} انتظار"
msgid "{} To Bill"
msgstr "{} برای صورتحساب"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr "{} را نمیتوان لغو کرد زیرا امتیازهای وفاداری به دست آمده استفاده شده است. ابتدا {} خیر {} را لغو کنید"
diff --git a/erpnext/locale/fr.po b/erpnext/locale/fr.po
index 32f5a8fc76f..9a258ddc016 100644
--- a/erpnext/locale/fr.po
+++ b/erpnext/locale/fr.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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:09\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:05\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: French\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr " Article"
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr "'Jours Depuis La Dernière Commande' doit être supérieur ou égal à z
msgid "'Default {0} Account' in Company {1}"
msgstr "'Compte {0} par défaut' dans la société {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr "'Entrées' ne peuvent pas être vides"
@@ -864,11 +864,11 @@ msgstr ""
msgid "Your Shortcuts"
msgstr "Vos raccourcis"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr ""
@@ -1239,10 +1239,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1547,7 +1547,7 @@ msgstr "Compte {0}: Le Compte parent {1} n'existe pas"
msgid "Account {0}: You can not assign itself as parent account"
msgstr "Compte {0}: Vous ne pouvez pas assigner un compte comme son propre parent"
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr "Compte: {0} est un travail capital et ne peut pas être mis à jour par une écriture au journal."
@@ -2036,7 +2036,7 @@ msgstr "Comptes gelés jusqu'au"
msgid "Accounts Manager"
msgstr "Responsable de la comptabilité"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr "Erreur de compte manquant"
@@ -2223,7 +2223,7 @@ msgstr "Paramètres de comptabilité"
msgid "Accounts User"
msgstr "Comptable"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr "Le tableau de comptes ne peut être vide."
@@ -2583,6 +2583,10 @@ msgstr "Heure de Fin Réelle"
msgid "Actual Expense"
msgstr "Dépense réelle"
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr ""
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2720,7 +2724,7 @@ msgstr "Ajouter / Modifier Prix"
msgid "Add Child"
msgstr "Ajouter une Sous-Catégorie"
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr "Ajouter des colonnes dans la devise de la transaction"
@@ -3526,7 +3530,7 @@ msgstr "Montant de l'Avance"
msgid "Advance amount cannot be greater than {0} {1}"
msgstr "Montant de l'avance ne peut être supérieur à {0} {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr ""
@@ -3583,7 +3587,7 @@ msgstr "Contre"
#: 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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr "Contrepartie"
@@ -3652,7 +3656,7 @@ msgstr "Pour le Compte de Charges"
msgid "Against Income Account"
msgstr "Pour le Compte de Produits"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr "L'Écriture de Journal {0} n'a pas d'entrée non associée {1}"
@@ -3700,7 +3704,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr "Pour le Bon"
@@ -3712,7 +3716,7 @@ msgstr "Pour le Bon"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr ""
@@ -3724,8 +3728,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr "Pour le Type de Bon"
@@ -3851,7 +3855,7 @@ msgstr "Tout"
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr "Tous les comptes"
@@ -4019,7 +4023,7 @@ msgstr "Tous les articles sont déjà demandés"
msgid "All items have already been Invoiced/Returned"
msgstr "Tous les articles ont déjà été facturés / retournés"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr ""
@@ -4045,7 +4049,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:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr "Tous ces articles ont déjà été facturés / retournés"
@@ -4931,7 +4935,7 @@ msgstr "Modifié Depuis"
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5071,7 +5075,7 @@ msgstr "Montant En Chiffre"
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr ""
@@ -5222,7 +5226,7 @@ msgstr "Un autre enregistrement Budget '{0}' existe déjà pour {1} '{2}' et pou
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr ""
@@ -5805,7 +5809,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5847,7 +5851,7 @@ msgstr ""
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr ""
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr ""
@@ -5886,7 +5890,7 @@ msgstr ""
msgid "Asset Finance Book"
msgstr "Livre comptable d'actifs"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr "Identifiant de l'actif"
@@ -5962,7 +5966,7 @@ msgstr "Registre de Mouvement de l'Actif {0} créé"
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr "Nom de l'Actif"
@@ -6048,9 +6052,9 @@ msgstr "Statut de l'actif"
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr "Valeur d'actif"
@@ -6079,7 +6083,7 @@ msgstr "Actif annulé"
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "L'actif ne peut être annulé, car il est déjà {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr ""
@@ -6111,7 +6115,7 @@ msgstr ""
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr ""
@@ -6123,11 +6127,11 @@ msgstr ""
msgid "Asset returned"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr "Actif mis au rebut"
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr "Actif mis au rebut via Écriture de Journal {0}"
@@ -6152,7 +6156,7 @@ msgstr "Actif mis à jour après avoir été divisé dans l'actif {0}"
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr "L'actif {0} ne peut pas être mis au rebut, car il est déjà {1}"
@@ -6185,7 +6189,15 @@ msgstr ""
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr ""
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr "L'actif {0} doit être soumis"
@@ -6566,7 +6578,7 @@ msgstr "Rapprochement automatique"
msgid "Auto Reconcile Payments"
msgstr "Rapprochement automatique des paiements"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr "Rapprochement automatique"
@@ -6576,7 +6588,7 @@ msgstr "Rapprochement automatique"
msgid "Auto Reconciliation Job Trigger"
msgstr "Déclencheur de tâche de rapprochement automatique"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr "Le rapprochement automatique a commencé en arrière-plan"
@@ -6751,7 +6763,7 @@ msgstr "Qté de lot disponible à l'Entrepôt"
msgid "Available Batch Report"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr "Date d'utilisation disponible"
@@ -6980,7 +6992,7 @@ msgstr "Nomenclature"
msgid "BOM 1"
msgstr "Nomenclature 1"
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "La nomenclature 1 {0} et la nomenclature 2 {1} ne doivent pas être identiques"
@@ -7218,23 +7230,23 @@ msgstr "Nomenclature ne contient aucun article en stock"
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr "Récursion de nomenclature: {0} ne peut pas être enfant de {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr "Nomenclature {0} n’appartient pas à l'article {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr "Nomenclature {0} doit être active"
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr "Nomenclature {0} doit être soumise"
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr "La nomenclature {0} n'existe pas pour l'article {1}"
@@ -7305,7 +7317,7 @@ msgstr "Solde"
msgid "Balance (Dr - Cr)"
msgstr "Solde (Debit - Crédit)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr "Solde ({0})"
@@ -7784,7 +7796,7 @@ msgstr "Cout de base"
msgid "Base Tax Withholding Net Total"
msgstr "Impôt retenu à la source sur le total net"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr "Total Net"
@@ -7989,7 +8001,9 @@ msgstr "Statut d'Expiration d'Article du Lot"
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -8000,7 +8014,7 @@ msgstr "N° du Lot"
msgid "Batch No is mandatory"
msgstr "Le numéro de lot est obligatoire"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr "Le lot n° {0} n'existe pas"
@@ -8023,7 +8037,7 @@ msgstr "N° du Lot."
msgid "Batch Nos"
msgstr "Numéros de lots"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr "Les numéros de lot sont créés avec succès"
@@ -8036,7 +8050,7 @@ msgstr "Lot non disponible pour le retour"
msgid "Batch Number Series"
msgstr "Série de numéros de lots"
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr "Qté du lot"
@@ -8149,7 +8163,7 @@ msgstr "Facturation de la quantité rejetée dans la facture d'achat"
#. Label of a Card Break in the Manufacturing Workspace
#. Label of a Link in the Manufacturing Workspace
-#: erpnext/manufacturing/doctype/bom/bom.py:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8462,8 +8476,8 @@ msgstr "Article de commande avec limites"
msgid "Blanket Order Rate"
msgstr "Prix unitaire de commande avec limites"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr "Bloquer la facture"
@@ -8579,7 +8593,7 @@ msgstr "Actif immobilisé comptabilisé"
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr ""
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr ""
@@ -9353,7 +9367,7 @@ msgstr "Impossible de filtrer en fonction du mode de paiement, s'il est regroup
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr "Impossible de filtrer sur la base du N° de Coupon, si les lignes sont regroupées par Coupon"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr "Le paiement n'est possible qu'avec les {0} non facturés"
@@ -9539,7 +9553,7 @@ msgstr "Impossible d'optimiser l'itinéraire car l'adresse du pilote est manquan
msgid "Cannot Relieve Employee"
msgstr "Ne peut pas soulager l'employé"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr ""
@@ -9555,6 +9569,10 @@ msgstr ""
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr "Ne peut pas être un article immobilisé car un Journal de Stock a été créé."
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr ""
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr ""
@@ -9644,7 +9662,7 @@ msgstr ""
msgid "Cannot create root account."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr "Désactivation ou annulation de la nomenclature impossible car elle est liée avec d'autres nomenclatures"
@@ -9661,7 +9679,7 @@ msgstr "Déduction impossible lorsque la catégorie est pour 'Évaluation' ou 'V
msgid "Cannot delete Exchange Gain/Loss row"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr "Impossible de supprimer les N° de série {0}, s'ils sont dans les mouvements de stock"
@@ -10107,11 +10125,11 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr "Changer le montant"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr "Modifier la date de fin de mise en attente"
@@ -10124,7 +10142,7 @@ msgstr "Modifier la date de fin de mise en attente"
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr ""
@@ -10932,6 +10950,7 @@ msgstr "Sociétés"
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11079,6 +11098,7 @@ msgstr "Sociétés"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11164,8 +11184,8 @@ msgstr "Sociétés"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11481,7 +11501,7 @@ msgstr ""
msgid "Company and Posting Date is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr "Les devises des deux sociétés doivent correspondre pour les transactions inter-sociétés."
@@ -12762,7 +12782,7 @@ msgstr "Coût"
#: 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12781,7 +12801,7 @@ msgstr "Coût"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -12994,7 +13014,7 @@ msgstr ""
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr "Impossible de créer automatiquement le client en raison du ou des champs obligatoires manquants suivants:"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr "Impossible de créer une note de crédit automatiquement, décochez la case "Emettre une note de crédit" et soumettez à nouveau"
@@ -13117,15 +13137,15 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13367,7 +13387,7 @@ msgstr "Créer une opportunité"
msgid "Create POS Opening Entry"
msgstr "Créer une entrée d'ouverture de PDV"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr "Créer une entrée de paiement"
@@ -13523,7 +13543,7 @@ msgstr "Création de comptes ..."
msgid "Creating Delivery Note ..."
msgstr ""
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr "Créer des dimensions ..."
@@ -13543,7 +13563,7 @@ msgstr "Création de factures d'achat ..."
msgid "Creating Purchase Order ..."
msgstr "Création d'une commande d'achat ..."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13580,11 +13600,6 @@ msgstr "Création de {} sur {} {}"
msgid "Creation"
msgstr ""
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr "N° du Document de Création"
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr ""
@@ -13617,11 +13632,11 @@ msgstr ""
msgid "Credit"
msgstr "Crédit"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr "Crédit ({0})"
@@ -13764,7 +13779,7 @@ msgstr "Note de crédit émise"
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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr "La note de crédit {0} a été créée automatiquement"
@@ -13972,7 +13987,7 @@ msgstr ""
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14071,7 +14086,7 @@ msgstr "Devise ne peut être modifiée après avoir fait des entrées en utilisa
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr "Devise pour {0} doit être {1}"
@@ -14421,6 +14436,7 @@ msgstr "Personnaliser ?"
#: 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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14448,6 +14464,10 @@ msgstr ""
msgid "Customer / Lead Address"
msgstr "Adresse du Lead / Prospect"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr ""
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14849,7 +14869,7 @@ msgstr "Client requis pour appliquer une 'Remise en fonction du Client'"
#: 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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr "Le Client {0} ne fait pas parti du projet {1}"
@@ -15201,7 +15221,7 @@ msgstr "Date d'Émission"
msgid "Date of Joining"
msgstr "Date d'Embauche"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr "Date de transaction"
@@ -15338,11 +15358,11 @@ msgstr "Cher Administrateur Système ,"
msgid "Debit"
msgstr "Débit"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr "Débit (Transaction)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr "Débit ({0})"
@@ -15416,7 +15436,7 @@ msgstr "Débit Pour"
msgid "Debit To is required"
msgstr "Compte de Débit Requis"
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr "Débit et Crédit non égaux pour {0} # {1}. La différence est de {2}."
@@ -16483,7 +16503,7 @@ msgstr ""
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16558,9 +16578,9 @@ msgstr ""
msgid "Depreciate based on shifts"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr "Montant amorti"
@@ -16616,6 +16636,14 @@ msgstr "Ecriture d’Amortissement"
msgid "Depreciation Entry Posting Status"
msgstr ""
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr ""
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16624,7 +16652,7 @@ msgstr ""
msgid "Depreciation Expense Account"
msgstr "Compte de Dotations aux Amortissement"
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr ""
@@ -17510,6 +17538,10 @@ msgstr ""
msgid "Discount Percentage"
msgstr "Remise en Pourcentage"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr ""
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr ""
@@ -17742,7 +17774,7 @@ msgstr "Paramètres de répartition"
msgid "Disposal Date"
msgstr "Date d’Élimination"
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr ""
@@ -18022,7 +18054,7 @@ msgstr ""
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr ""
@@ -19061,7 +19093,7 @@ msgstr "Vide"
msgid "Ems(Pica)"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr ""
@@ -19412,7 +19444,7 @@ msgstr ""
msgid "Enter a name for this Holiday List."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr "Entrez le montant à utiliser."
@@ -19473,7 +19505,7 @@ msgstr ""
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr "Saisissez le montant de {0}."
@@ -19493,7 +19525,7 @@ msgid "Entity"
msgstr "Entité"
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19588,7 +19620,7 @@ msgstr "Erreur lors de l'évaluation de la formule du critère"
msgid "Error in party matching for Bank Transaction {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr ""
@@ -19638,10 +19670,8 @@ msgstr "Durée et Coût Estimés"
msgid "Evaluation Period"
msgstr "Période d'Évaluation"
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
msgstr ""
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
@@ -20003,7 +20033,7 @@ msgstr "Valeur Attendue Après Utilisation Complète"
msgid "Expense"
msgstr "Charges"
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr "Compte de Charge / d'Écart ({0}) doit être un Compte «de Résultat»"
@@ -20048,7 +20078,7 @@ msgstr "Compte de Charge / d'Écart ({0}) doit être un Compte «de Résultat»"
msgid "Expense Account"
msgstr "Compte de Charge"
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr "Compte de dépenses manquant"
@@ -20355,7 +20385,7 @@ msgstr "Date d'échec"
msgid "Failure Description"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr ""
@@ -21031,6 +21061,10 @@ msgstr "Un Article Immobilisé doit être un élément non stocké."
msgid "Fixed Asset Register"
msgstr "Registre des immobilisations"
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21161,7 +21195,7 @@ msgstr "Pour le fournisseur par défaut (facultatif)"
msgid "For Item"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr ""
@@ -22053,7 +22087,7 @@ msgstr "Paiement futur Ref"
msgid "Future Payments"
msgstr "Paiements futurs"
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr ""
@@ -22069,7 +22103,7 @@ msgstr ""
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr "Écriture GL"
@@ -22335,8 +22369,8 @@ msgid "Get Items"
msgstr "Obtenir les Articles"
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22695,7 +22729,7 @@ msgstr ""
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22705,7 +22739,7 @@ msgstr ""
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22826,8 +22860,8 @@ msgstr ""
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr "Montant d'Achat Brut"
@@ -23178,7 +23212,7 @@ msgstr ""
msgid "Height (cm)"
msgstr "Hauteur (cm)"
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr ""
@@ -23217,7 +23251,7 @@ msgstr "Texte d'aide"
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr ""
@@ -23313,7 +23347,7 @@ msgstr "Mettre en attente"
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr "Facture en attente"
@@ -23407,6 +23441,10 @@ msgstr "Heures"
msgid "Hours Spent"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr ""
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23743,6 +23781,10 @@ msgstr "Les utilisateur de ce role pourront creer et modifier des transactions d
msgid "If more than one package of the same type (for print)"
msgstr "Si plus d'un paquet du même type (pour l'impression)"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr ""
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23759,6 +23801,10 @@ msgstr ""
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr ""
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23841,6 +23887,10 @@ msgstr "Si coché, plusieurs articles peuvent être utilisés pour un seul ordre
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr "Si coché, le coût de la nomenclature sera automatiquement mis à jour en fonction du taux de valorisation / prix de la liste prix / dernier prix d'achat des matières premières."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr ""
@@ -23935,7 +23985,7 @@ msgstr ""
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -23987,7 +24037,7 @@ msgstr ""
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr ""
@@ -24750,7 +24800,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24823,7 +24873,7 @@ msgstr ""
msgid "Incorrect Stock Value Report"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr ""
@@ -24990,13 +25040,13 @@ msgstr "Insérer de nouveaux enregistrements"
msgid "Inspected By"
msgstr "Inspecté Par"
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr ""
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr "Inspection obligatoire"
@@ -25013,7 +25063,7 @@ msgstr "Inspection Requise à l'expedition"
msgid "Inspection Required before Purchase"
msgstr "Inspection Requise à la réception"
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr ""
@@ -25043,7 +25093,7 @@ msgstr "Note d'Installation"
msgid "Installation Note Item"
msgstr "Article Remarque d'Installation"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr "Note d'Installation {0} à déjà été sousmise"
@@ -25101,7 +25151,7 @@ msgstr "Permissions insuffisantes"
#: 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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "Stock insuffisant"
@@ -25292,7 +25342,7 @@ msgstr ""
msgid "Internal Work History"
msgstr "Historique de Travail Interne"
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr ""
@@ -25328,7 +25378,7 @@ msgid "Invalid Account"
msgstr "Compte invalide"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr ""
@@ -25356,7 +25406,7 @@ msgstr "Commande avec limites non valide pour le client et l'article sélectionn
msgid "Invalid Child Procedure"
msgstr "Procédure enfant non valide"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr "Société non valide pour une transaction inter-sociétés."
@@ -25414,7 +25464,7 @@ msgid "Invalid Ledger Entries"
msgstr ""
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr "Entrée d'ouverture non valide"
@@ -25442,7 +25492,7 @@ msgstr ""
msgid "Invalid Priority"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr ""
@@ -25526,8 +25576,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr ""
@@ -25535,7 +25585,7 @@ msgstr ""
msgid "Invalid {0}"
msgstr "Invalide {0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr "{0} non valide pour la transaction inter-société."
@@ -25745,7 +25795,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26797,6 +26847,8 @@ msgstr ""
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26815,7 +26867,11 @@ msgstr "Code de l'Article"
msgid "Item Code (Final Product)"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr ""
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr "Code de l'Article ne peut pas être modifié pour le Numéro de Série"
@@ -27219,6 +27275,7 @@ msgstr "Fabricant d'Article"
#: 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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28139,7 +28196,7 @@ msgstr "Écriture de Journal pour la Mise au Rebut"
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr "L’Écriture de Journal {0} n'a pas le compte {1} ou est déjà réconciliée avec une autre pièce justificative"
@@ -28345,7 +28402,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29061,7 +29118,7 @@ msgstr "Locale"
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29732,7 +29789,7 @@ msgstr ""
msgid "Mandatory Depends On"
msgstr "Obligatoire dépend de"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr ""
@@ -29822,6 +29879,7 @@ msgstr "La saisie manuelle ne peut pas être créée! Désactivez la saisie auto
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30380,6 +30438,7 @@ msgid "Material Requested"
msgstr "Matériel demandé"
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr "Les Demandes de Matériel"
@@ -30735,7 +30794,7 @@ msgstr ""
msgid "Message Examples"
msgstr "Exemples de Messages"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr "Message envoyé"
@@ -31049,8 +31108,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr "Compte manquant"
@@ -31068,6 +31127,10 @@ msgstr ""
msgid "Missing Default in Company"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr ""
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr ""
@@ -31100,7 +31163,7 @@ msgstr "Valeurs Manquantes Requises"
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr "Modèle de courrier électronique manquant pour l'envoi. Veuillez en définir un dans les paramètres de livraison."
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr ""
@@ -31766,7 +31829,7 @@ msgstr "Gaz Naturel"
msgid "Needs Analysis"
msgstr "Analyse des besoins"
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr ""
@@ -32198,7 +32261,7 @@ msgstr "Nouvelles Commandes Client"
msgid "New Sales Person Name"
msgstr "Nouveau Nom de Commercial"
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr "Les Nouveaux N° de Série ne peuvent avoir d'entrepot. L'Entrepôt doit être établi par Écriture de Stock ou Reçus d'Achat"
@@ -32234,7 +32297,7 @@ msgstr ""
msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date"
msgstr "De nouvelles factures seront générées selon le calendrier, même si les factures actuelles sont impayées ou en retard"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr "La nouvelle date de sortie devrait être dans le futur"
@@ -32343,7 +32406,7 @@ msgstr "Pas d'action"
msgid "No Answer"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr "Aucun client trouvé pour les transactions intersociétés qui représentent l'entreprise {0}"
@@ -32400,9 +32463,9 @@ msgstr ""
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr "Aucune autorisation"
@@ -32437,7 +32500,7 @@ msgstr ""
msgid "No Summary"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr "Aucun fournisseur trouvé pour les transactions intersociétés qui représentent l'entreprise {0}"
@@ -32535,7 +32598,7 @@ msgstr ""
msgid "No items to be received are overdue"
msgstr "Aucun article à recevoir n'est en retard"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr ""
@@ -32669,11 +32732,11 @@ msgstr "Aucune transaction ne peux être créée ou modifié avant cette date."
msgid "No values"
msgstr "Pas de valeurs"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr "Aucun {0} n'a été trouvé pour les transactions inter-sociétés."
@@ -32708,7 +32771,7 @@ msgstr ""
msgid "Non Profit"
msgstr "À But Non Lucratif"
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr "Articles hors stock"
@@ -32887,7 +32950,7 @@ msgstr ""
msgid "Note: Email will not be sent to disabled users"
msgstr "Remarque : Email ne sera pas envoyé aux utilisateurs désactivés"
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr ""
@@ -32907,7 +32970,7 @@ msgstr "Remarque : Ce Centre de Coûts est un Groupe. Vous ne pouvez pas faire d
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr "Note : {0}"
@@ -32923,6 +32986,7 @@ msgstr "Note : {0}"
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33358,6 +33422,12 @@ msgstr "Seuls les noeuds feuilles sont autorisés dans une transaction"
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr ""
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr ""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33559,8 +33629,8 @@ msgstr "Ouverture (Dr)"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr "Amortissement Cumulé d'Ouverture"
@@ -33602,7 +33672,7 @@ msgstr "Date d'Ouverture"
msgid "Opening Entry"
msgstr "Écriture d'Ouverture"
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr ""
@@ -33630,7 +33700,7 @@ msgid "Opening Invoice Item"
msgstr "Ouverture d'un poste de facture"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 ""
@@ -33704,7 +33774,7 @@ msgstr "Coût d'Exploitation (Devise Société)"
msgid "Operating Cost Per BOM Quantity"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr "Coût d'exploitation selon l'ordre de fabrication / nomenclature"
@@ -33860,7 +33930,7 @@ msgstr "Opérations"
msgid "Operations Routing"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr "Les opérations ne peuvent pas être laissées vides"
@@ -34452,7 +34522,7 @@ msgstr ""
msgid "Over Picking Allowance"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr ""
@@ -34904,7 +34974,7 @@ msgstr "Article Emballé"
msgid "Packed Items"
msgstr "Articles Emballés"
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr ""
@@ -34939,7 +35009,7 @@ msgstr "Bordereau de Colis"
msgid "Packing Slip Item"
msgstr "Article Emballé"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr "Bordereau(x) de Colis annulé(s)"
@@ -35025,7 +35095,7 @@ msgstr "Payé"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35300,7 +35370,7 @@ msgstr ""
msgid "Partial Payment in POS Transactions are not allowed."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr ""
@@ -35494,9 +35564,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35657,9 +35727,9 @@ msgstr "Restriction d'article disponible"
#: 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35824,7 +35894,7 @@ msgstr "Paramètres du Payeur"
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -35960,7 +36030,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr "L’Écriture de Paiement a été modifié après que vous l’ayez récupérée. Veuillez la récupérer à nouveau."
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr "L’Écriture de Paiement est déjà créée"
@@ -36169,7 +36239,7 @@ msgstr "Références de Paiement"
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36195,11 +36265,11 @@ msgstr "Type de demande de paiement"
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr "Demande de paiement pour {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr ""
@@ -36357,7 +36427,7 @@ msgstr ""
msgid "Payment Unlink Error"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr "Paiement pour {0} {1} ne peut pas être supérieur à Encours {2}"
@@ -36678,7 +36748,7 @@ msgstr "Période"
msgid "Period Based On"
msgstr "Période basée sur"
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr ""
@@ -37281,7 +37351,7 @@ msgstr "Veuillez ajouter le compte à la société au niveau racine - {}"
msgid "Please add {1} role to user {0}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr ""
@@ -37289,7 +37359,7 @@ msgstr ""
msgid "Please attach CSV file"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr ""
@@ -37302,7 +37372,7 @@ msgstr ""
msgid "Please cancel related transaction."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr "Veuillez vérifier l'option Multi-Devises pour permettre les comptes avec une autre devise"
@@ -37379,7 +37449,7 @@ msgstr "Veuillez créer un reçu d'achat ou une facture d'achat pour l'article {
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr ""
@@ -37503,7 +37573,7 @@ msgstr "Veuillez d’abord entrer un Reçu d'Achat"
msgid "Please enter Receipt Document"
msgstr "Veuillez entrer le Document de Réception"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr "Veuillez entrer la date de Référence"
@@ -37628,8 +37698,8 @@ msgstr "Veuillez vous assurer que vous voulez vraiment supprimer tous les transa
msgid "Please mention 'Weight UOM' along with Weight."
msgstr ""
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr ""
@@ -37757,7 +37827,7 @@ msgstr "Veuillez sélectionner la Date de Comptabilisation avant de sélectionne
msgid "Please select Posting Date first"
msgstr "Veuillez d’abord sélectionner la Date de Comptabilisation"
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr "Veuillez sélectionner une Liste de Prix"
@@ -37789,7 +37859,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr "Veuillez sélectionner une nomenclature"
@@ -37879,6 +37949,10 @@ msgstr "Veuillez sélectionner une valeur pour {0} devis à {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
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr ""
@@ -37887,7 +37961,7 @@ msgstr ""
msgid "Please select atleast one operation to create Job Card"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr "Veuillez sélectionner un compte correct"
@@ -37968,15 +38042,15 @@ msgstr "Veuillez d’abord sélectionner {0}"
msgid "Please set 'Apply Additional Discount On'"
msgstr "Veuillez définir ‘Appliquer Réduction Supplémentaire Sur ‘"
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr "Veuillez définir 'Centre de Coûts des Amortissements d’Actifs’ de la Société {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr "Veuillez définir ‘Compte de Gain/Perte sur les Cessions d’Immobilisations’ de la Société {0}"
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr ""
@@ -37984,7 +38058,7 @@ msgstr ""
msgid "Please set Account"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr ""
@@ -38010,7 +38084,7 @@ msgstr ""
msgid "Please set Company"
msgstr "Veuillez sélectionner une Société"
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr "Veuillez définir le Compte relatif aux Amortissements dans la Catégorie d’Actifs {0} ou la Société {1}"
@@ -38028,7 +38102,7 @@ msgstr ""
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr ""
@@ -38091,7 +38165,7 @@ msgstr "Veuillez définir un compte dans l'entrepôt {0}"
msgid "Please set an Address on the Company '%s'"
msgstr ""
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr ""
@@ -38107,23 +38181,23 @@ msgstr "Veuillez définir au moins une ligne dans le tableau des taxes et des fr
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr "Veuillez définir un compte de Caisse ou de Banque par défaut pour le Mode de Paiement {0}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr "Veuillez définir le compte de trésorerie ou bancaire par défaut dans le mode de paiement {}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "Veuillez définir le compte par défaut en espèces ou en banque dans Mode de paiement {}"
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr ""
@@ -38227,7 +38301,7 @@ msgstr ""
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr ""
@@ -38240,7 +38314,7 @@ msgid "Please specify Company"
msgstr "Veuillez spécifier la Société"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr "Veuillez spécifier la Société pour continuer"
@@ -38413,6 +38487,7 @@ msgstr "Frais postaux"
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38447,11 +38522,11 @@ msgstr "Frais postaux"
#: 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38470,6 +38545,7 @@ msgstr "Frais postaux"
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38479,6 +38555,7 @@ msgstr "Frais postaux"
#: 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_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
@@ -39044,6 +39121,14 @@ msgstr "Règle de tarification Article Code"
msgid "Pricing Rule Item Group"
msgstr "Groupe de postes de règle de tarification"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr ""
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr ""
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr "La règle de tarification {0} est mise à jour"
@@ -39102,6 +39187,10 @@ msgstr "La règle de tarification {0} est mise à jour"
msgid "Pricing Rules"
msgstr "Règles de tarification"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr ""
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39489,7 +39578,7 @@ msgstr "Description du processus"
msgid "Process Loss"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr ""
@@ -39979,7 +40068,7 @@ msgstr ""
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40454,7 +40543,7 @@ msgstr "Analyses des Achats"
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr "Date d'Achat"
@@ -40610,7 +40699,7 @@ msgstr "Responsable des Données d’Achats"
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40786,9 +40875,9 @@ msgstr "Liste des Prix d'Achat"
#. 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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41669,6 +41758,7 @@ msgstr "Objectif de revue de qualité"
#: 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/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
@@ -41785,7 +41875,7 @@ msgstr "Quantité ne doit pas être plus de {0}"
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr "Quantité d'article obtenue après production / reconditionnement des quantités données de matières premières"
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr "Quantité requise pour l'Article {0} à la ligne {1}"
@@ -42634,7 +42724,7 @@ msgid "Reason"
msgstr "Raison"
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "Raison de la mise en attente"
@@ -43070,7 +43160,7 @@ msgstr "Échanger contre"
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr "Échanger des points de fidélité"
@@ -43202,7 +43292,7 @@ msgstr "Date de Réf."
msgid "Reference"
msgstr "Référence"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr "Référence #{0} datée du {1}"
@@ -43340,7 +43430,7 @@ msgstr "Nom de référence"
msgid "Reference No"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr "N° et Date de Référence sont nécessaires pour {0}"
@@ -43348,11 +43438,11 @@ msgstr "N° et Date de Référence sont nécessaires pour {0}"
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr "Le N° de Référence et la Date de Référence sont nécessaires pour une Transaction Bancaire"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr "N° de Référence obligatoire si vous avez entré une date"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr "Numéro de référence"
@@ -43466,11 +43556,11 @@ msgstr "Référence: {0}, Code de l'article: {1} et Client: {2}"
msgid "References"
msgstr "Références"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr ""
@@ -43615,8 +43705,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43635,7 +43725,7 @@ msgstr "Date de Relève"
msgid "Remaining"
msgstr "Restant"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr ""
@@ -43648,7 +43738,7 @@ msgstr "Solde restant"
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr "Remarque"
@@ -43697,7 +43787,7 @@ msgstr "Remarque"
#: 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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -44008,7 +44098,7 @@ msgstr ""
msgid "Repost Status"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr ""
@@ -44332,7 +44422,7 @@ msgstr "Re-sélectionner, si le contact choisi est édité après l'enregistreme
msgid "Reseller"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr "Renvoyer Email de Paiement"
@@ -44801,7 +44891,7 @@ msgstr "Retour"
msgid "Return / Credit Note"
msgstr "Retour / Note de crédit"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr "Retour / Note de Débit"
@@ -45325,12 +45415,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1919
msgid "Row #{0} (Payment Table): Amount must be negative"
msgstr "Row # {0} (Table de paiement): le montant doit être négatif"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:515
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "Ligne #{0} (Table de paiement): Le montant doit être positif"
@@ -45476,7 +45566,7 @@ msgstr "Ligne # {0}: entrée en double dans les références {1} {2}"
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr "Ligne {0}: la date de livraison prévue ne peut pas être avant la date de commande"
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr ""
@@ -45500,11 +45590,11 @@ msgstr ""
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr ""
@@ -45524,7 +45614,7 @@ msgstr "Ligne n ° {0}: élément ajouté"
msgid "Row #{0}: Item {1} does not exist"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr "Ligne #{0} : l'article {1} a été prélevé, veuillez réserver le stock depuis la liste de prélèvement."
@@ -45560,7 +45650,7 @@ msgstr ""
msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
msgstr "Ligne #{0} : Changement de Fournisseur non autorisé car une Commande d'Achat existe déjà"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr ""
@@ -45605,15 +45695,15 @@ msgstr ""
msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr ""
@@ -45622,7 +45712,7 @@ msgstr ""
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "Ligne n° {0}: La quantité de l'article {1} ne peut être nulle"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr ""
@@ -45716,19 +45806,19 @@ msgstr "Ligne n ° {0}: l'état doit être {1} pour l'actualisation de facture {
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr ""
@@ -45736,8 +45826,8 @@ msgstr ""
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr ""
@@ -45918,7 +46008,7 @@ msgstr ""
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr ""
@@ -45926,11 +46016,11 @@ msgstr ""
msgid "Row {0}: Activity Type is mandatory."
msgstr "Ligne {0} : Le Type d'Activité est obligatoire."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr "Ligne {0} : L’Avance du Client doit être un crédit"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr "Ligne {0} : L’Avance du Fournisseur doit être un débit"
@@ -45950,7 +46040,7 @@ msgstr ""
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr "Ligne {0} : Nomenclature non trouvée pour l’Article {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr ""
@@ -45966,7 +46056,7 @@ msgstr ""
msgid "Row {0}: Cost center is required for an item {1}"
msgstr "Ligne {0}: le Centre de Coûts est requis pour un article {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr "Ligne {0} : L’Écriture de crédit ne peut pas être liée à un {1}"
@@ -45974,7 +46064,7 @@ msgstr "Ligne {0} : L’Écriture de crédit ne peut pas être liée à un {1}"
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr "Ligne {0} : La devise de la nomenclature #{1} doit être égale à la devise sélectionnée {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr "Ligne {0} : L’Écriture de Débit ne peut pas être lié à un {1}"
@@ -45990,7 +46080,7 @@ msgstr "Ligne {0}: la date d'échéance dans le tableau des conditions de paieme
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "Ligne {0} : Le Taux de Change est obligatoire"
@@ -46024,7 +46114,7 @@ msgstr "Ligne {0} : Heure de Début et Heure de Fin obligatoires."
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr "Ligne {0} : Heure de Début et Heure de Fin de {1} sont en conflit avec {2}"
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46036,7 +46126,7 @@ msgstr "Ligne {0}: le temps doit être inférieur au temps"
msgid "Row {0}: Hours value must be greater than zero."
msgstr "Ligne {0} : La valeur des heures doit être supérieure à zéro."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr "Ligne {0} : Référence {1} non valide"
@@ -46060,7 +46150,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr ""
@@ -46068,7 +46158,7 @@ msgstr ""
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr "Ligne {0} : Tiers / Compte ne correspond pas à {1} / {2} en {3} {4}"
@@ -46080,11 +46170,11 @@ msgstr "Ligne {0} : Le Type de Tiers et le Tiers sont requis pour le compte Déb
msgid "Row {0}: Payment Term is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr "Ligne {0} : Paiements contre Commandes Client / Fournisseur doivent toujours être marqués comme des avances"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr "Ligne {0} : Veuillez vérifier 'Est Avance' sur le compte {1} si c'est une avance."
@@ -46152,7 +46242,7 @@ msgstr ""
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr "Ligne {0}: l'article sous-traité est obligatoire pour la matière première {1}"
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46176,7 +46266,7 @@ msgstr ""
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "Ligne {0} : Facteur de Conversion nomenclature est obligatoire"
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr ""
@@ -46197,7 +46287,7 @@ msgstr "Ligne {0}: {1} doit être supérieure à 0"
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr "Ligne {0} : {1} {2} ne correspond pas à {3}"
@@ -46590,7 +46680,7 @@ msgstr ""
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr "La Facture Vente {0} a déjà été transmise"
@@ -46819,7 +46909,7 @@ msgstr ""
msgid "Sales Order Trends"
msgstr "Tendances des Commandes Client"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr "Commande Client requise pour l'Article {0}"
@@ -47329,8 +47419,8 @@ msgstr "Samedi"
#: 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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47601,7 +47691,7 @@ msgstr "Coût de Mise au Rebut des Matériaux (Devise Société)"
msgid "Scrap Warehouse"
msgstr "Entrepôt de Rebut"
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr ""
@@ -47674,7 +47764,7 @@ msgstr ""
msgid "Section"
msgstr "Section"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr "Code de section"
@@ -48044,7 +48134,7 @@ msgstr "Sélectionnez, pour rendre le client recherchable avec ces champs"
msgid "Selected POS Opening Entry should be open."
msgstr "L'entrée d'ouverture de PDV sélectionnée doit être ouverte."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr "La liste de prix sélectionnée doit avoir les champs d'achat et de vente cochés."
@@ -48228,7 +48318,7 @@ msgstr "Envoyer avec pièce jointe"
msgid "Sender"
msgstr "Expéditeur"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr "Envoi"
@@ -48352,7 +48442,9 @@ msgstr ""
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48383,7 +48475,9 @@ msgid "Serial No Count"
msgstr "Numéro de série"
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr ""
@@ -48391,7 +48485,7 @@ msgstr ""
msgid "Serial No Range"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr ""
@@ -48431,6 +48525,13 @@ msgstr "N° de Série et lot"
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr ""
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr ""
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr ""
@@ -48460,7 +48561,7 @@ msgstr "N° de Série {0} n'appartient pas à l'Article {1}"
msgid "Serial No {0} does not exist"
msgstr "N° de Série {0} n’existe pas"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr ""
@@ -48509,7 +48610,7 @@ msgstr ""
msgid "Serial Nos and Batches"
msgstr "N° de Série et Lots"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr ""
@@ -48587,11 +48688,11 @@ msgstr ""
msgid "Serial and Batch Bundle"
msgstr "Ensemble de n° de série et lot"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr ""
@@ -49025,7 +49126,7 @@ msgstr ""
msgid "Set Loyalty Program"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr "Définir la nouvelle date de fin de mise en attente"
@@ -49280,7 +49381,7 @@ msgstr ""
msgid "Setting up company"
msgstr "Création d'entreprise"
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49464,7 +49565,7 @@ msgstr ""
msgid "Shipment details"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr "Livraisons"
@@ -49711,6 +49812,10 @@ msgstr "Afficher les entrées annulées"
msgid "Show Completed"
msgstr "Montrer terminé"
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr ""
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr "Afficher le montant cumulatif"
@@ -49826,7 +49931,7 @@ msgstr ""
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr ""
@@ -50131,13 +50236,27 @@ msgstr ""
msgid "Source DocType"
msgstr "DocType source"
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr ""
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr "Nom du Document Source"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr ""
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr "Type de Document Source"
@@ -50208,7 +50327,7 @@ msgstr "Adresse de l'entrepôt source"
msgid "Source Warehouse Address Link"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr ""
@@ -50719,7 +50838,7 @@ msgstr "État / Province"
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51062,7 +51181,7 @@ msgstr "Écriture de Stock {0} créée"
msgid "Stock Entry {0} has created"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr "Écriture de Stock {0} n'est pas soumise"
@@ -51285,13 +51404,13 @@ msgstr ""
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51300,13 +51419,13 @@ msgstr ""
msgid "Stock Reservation"
msgstr "Réservation de stock"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr ""
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr ""
@@ -51328,7 +51447,7 @@ msgstr ""
msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr "Une réservation de stock a été créée pour cette liste de prélèvement, il n'est plus possible de mettre à jour la liste de prélèvement. Si vous souhaitez la modifier, nous recommandons de l'annuler et d'en créer une nouvelle."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr ""
@@ -51573,7 +51692,7 @@ msgstr ""
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr ""
@@ -51589,7 +51708,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr ""
@@ -52457,10 +52576,15 @@ msgstr "Qté Fournie"
#: 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "Fournisseur"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr ""
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52573,7 +52697,7 @@ msgstr ""
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr "Date de la Facture du Fournisseur"
@@ -52587,8 +52711,8 @@ msgstr "Fournisseur Date de la Facture du Fournisseur ne peut pas être postéri
#: 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "N° de Facture du Fournisseur"
@@ -53135,16 +53259,16 @@ msgstr ""
msgid "System will notify to increase or decrease quantity or amount "
msgstr "Le système notifiera d'augmenter ou de diminuer la quantité ou le montant"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr ""
@@ -53161,7 +53285,7 @@ msgstr ""
msgid "TDS Payable"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr ""
@@ -53717,7 +53841,7 @@ msgstr "Type de Taxe"
msgid "Tax Withheld Vouchers"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr ""
@@ -54342,7 +54466,7 @@ msgstr "L'accès à la demande de devis du portail est désactivé. Pour autoris
msgid "The BOM which will be replaced"
msgstr "La nomenclature qui sera remplacée"
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr ""
@@ -54370,7 +54494,7 @@ msgstr ""
msgid "The Loyalty Program isn't valid for the selected company"
msgstr "Le programme de fidélité n'est pas valable pour la société sélectionnée"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr ""
@@ -54394,7 +54518,7 @@ msgstr ""
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr ""
@@ -54416,7 +54540,7 @@ msgstr ""
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr "Le titre du compte de Passif ou de Capitaux Propres, dans lequel les Bénéfices/Pertes seront comptabilisés"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr ""
@@ -54457,7 +54581,7 @@ msgstr "Le champ 'De l'actionnaire' ne peut pas être vide"
msgid "The field To Shareholder cannot be blank"
msgstr "Le champ 'A l'actionnaire' ne peut pas être vide"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr ""
@@ -54473,7 +54597,7 @@ msgstr "Les numéros de folio ne correspondent pas"
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr ""
@@ -54734,6 +54858,10 @@ msgstr ""
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr "Il y a une maintenance active ou des réparations sur l'actif. Vous devez les compléter tous avant d'annuler l'élément."
@@ -55000,7 +55128,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr ""
@@ -55008,7 +55136,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr ""
@@ -55783,6 +55911,10 @@ msgstr "Pour inclure la taxe de la ligne {0} dans le prix de l'Article, les taxe
msgid "To merge, following properties must be same for both items"
msgstr "Pour fusionner, les propriétés suivantes doivent être les mêmes pour les deux articles"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr "Pour contourner ce problème, activez «{0}» dans l'entreprise {1}"
@@ -55800,7 +55932,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr ""
@@ -56022,7 +56154,7 @@ msgstr ""
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56184,7 +56316,7 @@ msgstr "Le montant total du crédit / débit doit être le même que dans l'écr
msgid "Total Debit"
msgstr "Total Débit"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr "Le Total du Débit doit être égal au Total du Crédit. La différence est de {0}"
@@ -56777,6 +56909,10 @@ msgstr "Totaux"
msgid "Traceability"
msgstr "Traçabilité"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr ""
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56817,7 +56953,7 @@ msgstr ""
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -56915,7 +57051,7 @@ msgstr "Paramètres des transactions"
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr "Type de transaction"
@@ -56937,7 +57073,7 @@ msgstr "Référence de la transaction n° {0} datée du {1}"
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57534,7 +57670,11 @@ msgstr "Montant Non Alloué"
msgid "Unassigned Qty"
msgstr "Qté non affectée"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr "Débloquer la facture"
@@ -58901,7 +59041,7 @@ msgstr ""
msgid "Vendor Invoices"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr "Nom du vendeur"
@@ -58968,7 +59108,7 @@ msgstr "Paramètres vidéo"
#: 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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59159,11 +59299,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59198,7 +59338,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr ""
@@ -59230,9 +59370,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59251,6 +59391,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_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
@@ -59460,6 +59601,7 @@ msgstr "Spontané"
#: 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_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
@@ -59568,7 +59710,7 @@ msgstr "Entrepôt et Référence"
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr "L'entrepôt ne peut pas être supprimé car une écriture existe dans le Livre d'Inventaire pour cet entrepôt."
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr "L'entrepôt ne peut être modifié pour le N° de Série"
@@ -59581,7 +59723,7 @@ msgid "Warehouse not found against the account {0}"
msgstr "Entrepôt introuvable sur le compte {0}"
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr "Magasin requis pour l'article en stock {0}"
@@ -59732,7 +59874,7 @@ msgstr ""
msgid "Warning!"
msgstr "Avertissement!"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr "Attention : Un autre {0} {1} # existe pour l'écriture de stock {2}"
@@ -60215,6 +60357,7 @@ msgstr "Entrepôt de travaux en cours"
#: 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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "Ordre de fabrication"
@@ -60690,7 +60833,7 @@ msgstr ""
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr "Vous n'êtes pas autorisé à effectuer la mise à jour selon les conditions définies dans {} Workflow."
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr "Vous n'êtes pas autorisé à ajouter ou faire une mise à jour des écritures avant le {0}"
@@ -60722,7 +60865,7 @@ msgstr "Vous pouvez également définir le compte CWIP par défaut dans Entrepri
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr "Vous pouvez changer le compte parent en compte de bilan ou sélectionner un autre compte."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr "Vous ne pouvez pas entrer le bon actuel dans la colonne 'Pour l'Écriture de Journal'"
@@ -60739,7 +60882,7 @@ msgstr "Vous pouvez uniquement échanger un maximum de {0} points dans cet comma
msgid "You can only select one mode of payment as default"
msgstr "Vous ne pouvez sélectionner qu'un seul mode de paiement par défaut"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr "Vous pouvez utiliser jusqu'à {0}."
@@ -60771,11 +60914,11 @@ msgstr ""
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr "Vous ne pouvez pas créer ou annuler des écritures comptables dans la période comptable clôturée {0}"
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr "Vous ne pouvez pas créditer et débiter le même compte simultanément"
@@ -60791,7 +60934,7 @@ msgstr "Vous ne pouvez pas modifier le nœud racine."
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr "Vous ne pouvez pas utiliser plus de {0}."
@@ -60823,7 +60966,7 @@ msgstr "Vous ne disposez pas des autorisations nécessaires pour {} éléments d
msgid "You don't have enough Loyalty Points to redeem"
msgstr "Vous n'avez pas assez de points de fidélité à échanger"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr "Vous n'avez pas assez de points à échanger."
@@ -61249,7 +61392,7 @@ msgstr "Titre"
msgid "to"
msgstr "à"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr ""
@@ -61289,7 +61432,7 @@ msgstr "{0}"
msgid "{0} '{1}' is disabled"
msgstr "{0} '{1}' est désactivé(e)"
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr "{0} '{1}' n'est pas dans l’Exercice {2}"
@@ -61321,7 +61464,7 @@ msgstr "Le {0} coupon utilisé est {1}. La quantité autorisée est épuisée"
msgid "{0} Digest"
msgstr "Résumé {0}"
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr "Le {0} numéro {1} est déjà utilisé dans {2} {3}"
@@ -61337,7 +61480,7 @@ msgstr "{0} demande de {1}"
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr "{0} Conserver l'échantillon est basé sur le lot, veuillez cocher A un numéro de lot pour conserver l'échantillon d'article"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr ""
@@ -61353,19 +61496,19 @@ msgstr ""
msgid "{0} account not found while submitting purchase receipt"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr "{0} pour la Facture {1} du {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr "{0} pour la Commande d'Achat {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr "{0} pour la Facture de Vente {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr "{0} pour la Commande Client {1}"
@@ -61373,7 +61516,7 @@ msgstr "{0} pour la Commande Client {1}"
msgid "{0} already has a Parent Procedure {1}."
msgstr "{0} a déjà une procédure parent {1}."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr "{0} et {1}"
@@ -61432,7 +61575,7 @@ msgstr "{0} est entré deux fois dans la Taxe de l'Article"
msgid "{0} entered twice {1} in Item Taxes"
msgstr ""
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr "{0} pour {1}"
@@ -61485,7 +61628,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr "{0} est obligatoire pour l’Article {1}"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr ""
@@ -61560,7 +61703,7 @@ msgstr "{0} articles produits"
msgid "{0} must be negative in return document"
msgstr "{0} doit être négatif dans le document de retour"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr ""
@@ -61576,7 +61719,7 @@ msgstr "Le paramètre {0} n'est pas valide"
msgid "{0} payment entries can not be filtered by {1}"
msgstr "{0} écritures de paiement ne peuvent pas être filtrées par {1}"
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr ""
@@ -61637,7 +61780,7 @@ msgstr "{0} {1}"
msgid "{0} {1} Manually"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr ""
@@ -61702,7 +61845,7 @@ msgstr "{0} {1} est annulé ou arrêté"
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr "{0} {1} est annulé, donc l'action ne peut pas être complétée"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr "{0} {1} est fermé"
@@ -61714,7 +61857,7 @@ msgstr "{0} {1} est désactivé"
msgid "{0} {1} is frozen"
msgstr "{0} {1} est gelée"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr "{0} {1} est entièrement facturé"
@@ -61726,12 +61869,12 @@ msgstr "{0} {1} n'est pas actif"
msgid "{0} {1} is not associated with {2} {3}"
msgstr "{0} {1} n'est pas associé à {2} {3}"
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr "{0} {1} n'a pas été soumis"
@@ -61743,7 +61886,7 @@ msgstr ""
msgid "{0} {1} must be submitted"
msgstr "{0} {1} doit être soumis"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr ""
@@ -61778,7 +61921,7 @@ msgstr "{0} {1} : Compte {2} inactif"
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr "{0} {1} : L’Écriture Comptable pour {2} peut seulement être faite en devise: {3}"
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr "{0} {1}: Centre de Coûts est obligatoire pour l’Article {2}"
@@ -61856,7 +61999,7 @@ msgstr "{doctype} {name} est annulé ou fermé."
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr ""
@@ -61864,7 +62007,7 @@ msgstr ""
msgid "{ref_doctype} {ref_name} is {status}."
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr ""
@@ -61922,7 +62065,7 @@ msgstr ""
msgid "{} To Bill"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr "{} ne peut pas être annulé car les points de fidélité gagnés ont été utilisés. Annulez d'abord le {} Non {}"
diff --git a/erpnext/locale/hr.po b/erpnext/locale/hr.po
index 5e86bf8e24c..96c2cff606b 100644
--- a/erpnext/locale/hr.po
+++ b/erpnext/locale/hr.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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:10\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:06\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Croatian\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr " Artikal"
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr "'Dana od posljednje narudžbe' mora biti veći ili jednako nuli"
msgid "'Default {0} Account' in Company {1}"
msgstr "'Standard {0} račun' u Tvrtki {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr "Polje 'Unosi' ne može biti prazno"
@@ -913,11 +913,11 @@ msgstr "Prečice"
msgid "Your Shortcuts"
msgstr "Prečice"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr "Ukupno: {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr "Nepodmireni iznos: {0}"
@@ -1313,10 +1313,10 @@ msgstr "Prema Sastavnici {0}, artikal '{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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1621,7 +1621,7 @@ msgstr "Račun {0}: Matični račun {1} ne postoji"
msgid "Account {0}: You can not assign itself as parent account"
msgstr "Račun {0}: Ne možete se dodijeliti kao matični račun"
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr "Račun: {0} je Kapitalni Rad u toku i ne može se ažurirati Nalogom Knjiženja"
@@ -2110,7 +2110,7 @@ msgstr "Računi Zamrznuti Do"
msgid "Accounts Manager"
msgstr "Upravitelj Knjigovodstva"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr "Greška Nepostojanja Računa"
@@ -2297,7 +2297,7 @@ msgstr "Postavke Kjnigovodstva"
msgid "Accounts User"
msgstr "Korisnik Računa"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr "Tabela računa ne može biti prazna."
@@ -2657,6 +2657,10 @@ msgstr "Stvarno Vrijeme Završetka"
msgid "Actual Expense"
msgstr "Stvarni Trošak"
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr "Stvarni Troškovi"
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2794,7 +2798,7 @@ msgstr "Dodaj / Uredi cijene"
msgid "Add Child"
msgstr "Dodaj Podređeni"
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr "Dodaj Kolone u Valuti Transakcije"
@@ -3600,7 +3604,7 @@ msgstr "Iznos Predujma"
msgid "Advance amount cannot be greater than {0} {1}"
msgstr "Iznos Predujma ne može biti veći od {0} {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr "Predujam plaćen naspram {0} {1} ne može biti veći od ukupnog iznosa {2}"
@@ -3657,7 +3661,7 @@ msgstr "Naspram"
#: 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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr "Naspram Računa"
@@ -3726,7 +3730,7 @@ msgstr "Naspram Računa Troškova"
msgid "Against Income Account"
msgstr "Naspram Računa Prihoda"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr "Naspram Naloga Knjiženja {0} nema neusaglašen unos {1}"
@@ -3774,7 +3778,7 @@ msgstr "Naspram 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr "Naspram Verifikata"
@@ -3786,7 +3790,7 @@ msgstr "Naspram Verifikata"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr "Naspram Verifikata Broj"
@@ -3798,8 +3802,8 @@ msgstr "Naspram Verifikata Broj"
#: 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr "Naspram Verifikata Tipa"
@@ -3925,7 +3929,7 @@ msgstr "Sve"
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr "Kontni Plan"
@@ -4093,7 +4097,7 @@ msgstr "Svi artikli su već traženi"
msgid "All items have already been Invoiced/Returned"
msgstr "Svi Artikli su već Fakturisani/Vraćeni"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr "Svi Artikli su već primljeni"
@@ -4119,7 +4123,7 @@ msgstr "Svi artikli su već vraćeni."
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 "Svi obavezni Artikli (sirovine) bit će preuzeti iz Sastavnice i popunjene u ovoj tabeli. Ovdje također možete promijeniti izvorno skladište za bilo koji artikal. A tokom proizvodnje možete pratiti prenesene sirovine iz ove tabele."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr "Svi ovi Artikli su već Fakturisani/Vraćeni"
@@ -5005,7 +5009,7 @@ msgstr "Izmijenjeno od"
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5145,7 +5149,7 @@ msgstr "Iznos na Slici"
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr "Iznos u Valuti Računa"
@@ -5296,7 +5300,7 @@ msgstr "Još jedan Budžetski zapis '{0}' već postoji naspram {1} '{2}' i raču
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr "Drugi zapis dodjele Centra Troškova {0} primjenjiv od {1}, stoga će ova dodjela biti primjenjiva do {2}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr "Drugi Zahtjev za Plaćanje je već obrađen"
@@ -5879,7 +5883,7 @@ msgstr "Kapitalizacija Imovine Artikal Zalihe"
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5921,7 +5925,7 @@ msgstr "Raspored Amortizacije Imovine"
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr "Raspored Amortizacije Imovine {0} i Finansijski Registar {1} ne koristi amortizaciju zasnovanu na smjenama"
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr "Raspored amortizacije imovine nije pronađen za Imovinu {0} i Finansijski Registar {1}"
@@ -5960,7 +5964,7 @@ msgstr "Odstranjivanje Imovine"
msgid "Asset Finance Book"
msgstr "Registar o Finansijama Imovine"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr "ID Imovine"
@@ -6036,7 +6040,7 @@ msgstr "Zapis o kretanju imovine {0} kreiran"
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr "Naziv Imovine"
@@ -6122,9 +6126,9 @@ msgstr "Status Imovine"
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr "Vrijednost Imovine"
@@ -6153,7 +6157,7 @@ msgstr "Imovina otkazana"
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "Imovina se ne može otkazati, jer je već {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr "Imovina se ne može rashodovati prije posljednjeg unosa amortizacije."
@@ -6185,7 +6189,7 @@ msgstr "Imovina nije u funkciji zbog popravke imovine {0}"
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr "Imovina primljena u {0} i izdata {1}"
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr "Imovina vraćena"
@@ -6197,11 +6201,11 @@ msgstr "Imovina vraćena nakon što je kapitalizacija imovine {0} otkazana"
msgid "Asset returned"
msgstr "Imovina vraćena"
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr "Imovina rashodovana"
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr "Imovina rashodovana putem Naloga Knjiženja {0}"
@@ -6226,7 +6230,7 @@ msgstr "Imovina je ažurirana nakon što je podijeljena na Imovinu {0}"
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr "Imovina ažurirana zbog Popravke Imovine {0} {1}."
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr "Imovina {0} se nemože rashodovati, jer je već {1}"
@@ -6259,7 +6263,15 @@ msgstr "Imovina {0} je ažurirana. Postavi detalje amortizacije ako ih ima i pod
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr "Imovina {0} je u statusu {1} i ne može se popraviti."
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr "Imovina {0} nije postavljena za izračun amortizacije."
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr "Imovina {0} nije podnešena. Podnesi imovinu prije nego što nastavite."
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr "Imovina {0} mora biti podnešena"
@@ -6640,7 +6652,7 @@ msgstr "Automatski Usaglasi"
msgid "Auto Reconcile Payments"
msgstr "Automatski Usaglasi Plaćanja"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr "Automatsko Usaglašavanje"
@@ -6650,7 +6662,7 @@ msgstr "Automatsko Usaglašavanje"
msgid "Auto Reconciliation Job Trigger"
msgstr "Okidač Posla Automatskog Usaglašavanja"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr "Automatsko Ssklađivanje je počelo u pozadini"
@@ -6825,7 +6837,7 @@ msgstr "Dostupna količina Šarže u Skladištu"
msgid "Available Batch Report"
msgstr "Dostupni Izvještaj o Šarži"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr "Datum Dostupnosti za Upotrebu"
@@ -7054,7 +7066,7 @@ msgstr "Sastavnica"
msgid "BOM 1"
msgstr "Sastavnica 1"
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "Sastavnica 1 {0} i Sastavnica 2 {1} ne bi trebali biti isti"
@@ -7292,23 +7304,23 @@ msgstr "Sastavnica ne sadrži nijedan artikal zaliha"
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr "Rekurzija Sastavnice: {0} ne može biti podređena {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr "Rekurzija Sastavnice: {1} ne može biti nadređena ili podređena {0}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr "Sastavnica {0} ne pripada Artiklu {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr "Sastavnica {0} mora biti aktivana"
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr "Sastavnica {0} se mora podnijeti"
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr "Sastavnica {0} nije pronađena za artikal {1}"
@@ -7379,7 +7391,7 @@ msgstr "Stanje"
msgid "Balance (Dr - Cr)"
msgstr "Stanje (Dr - Cr)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr "Stanje ({0})"
@@ -7858,7 +7870,7 @@ msgstr "Osnovna Cijena"
msgid "Base Tax Withholding Net Total"
msgstr "Neto ukupni PDV po odbitku"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr "Osnovni Ukupni Iznos"
@@ -8063,7 +8075,9 @@ msgstr "Status isteka roka Artikla Šarže"
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -8074,7 +8088,7 @@ msgstr "Broj Šarže"
msgid "Batch No is mandatory"
msgstr "Broj Šarže je obavezan"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr "Broj Šarže {0} ne postoji"
@@ -8097,7 +8111,7 @@ msgstr "Broj Šarže"
msgid "Batch Nos"
msgstr "Broj Šarže"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr "Brojevi Šarže su uspješno kreirani"
@@ -8110,7 +8124,7 @@ msgstr "Šarža nije dostupna za povrat"
msgid "Batch Number Series"
msgstr "Imenovanje Šarže"
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr "Količina Šarže"
@@ -8223,7 +8237,7 @@ msgstr "Faktura za odbijenu količinu na Kupovnoj Fakturi"
#. Label of a Card Break in the Manufacturing Workspace
#. Label of a Link in the Manufacturing Workspace
-#: erpnext/manufacturing/doctype/bom/bom.py:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8536,8 +8550,8 @@ msgstr "Ugovorni Nalog Artikal"
msgid "Blanket Order Rate"
msgstr "Cijena po Ugovornom Nalogu"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr "Blokiraj Fakturu"
@@ -8653,7 +8667,7 @@ msgstr "Proknjižena Osnovna Imovina"
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr "Knjiženje vrijednosti zaliha na više računa će otežati praćenje zaliha i vrijednosti računa."
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr "Knjigovodstvo je zatvoreno do perioda koji se završava {0}"
@@ -9427,7 +9441,7 @@ msgstr "Ne može se filtrirati na osnovu Načina Plaćanja, ako je grupirano pre
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr "Ne može se filtrirati na osnovu broja verifikata, ako je grupiran prema verifikatu"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr "Plaćanje se može izvršiti samo protiv nefakturisanog(e) {0}"
@@ -9613,7 +9627,7 @@ msgstr "Nije moguće optimizirati put jer nedostaje adresa vozača."
msgid "Cannot Relieve Employee"
msgstr "Nije moguće razriješiti Personal"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr "Nije moguće ponovo dostaviti unose u Registar za verifikate u završenoj Fiskalnoj Godini."
@@ -9629,6 +9643,10 @@ msgstr "Ne može se primijeniti TDS naspram više strana u jednom unosu"
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr "Ne može biti artikal fiksne imovine jer je kreiran Registar Zaliha."
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr "Nije moguće otkazati Raspored Amortizacije Imovine {0} jer postoji nacrt naloga knjiženja {1}."
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr "Ne može se otkazati Unos Zatvaranja Blagajne"
@@ -9718,7 +9736,7 @@ msgstr "Nije moguće stvoriti povrat za objedinjenu fakturu {0}."
msgid "Cannot create root account."
msgstr "Ne mogu stvoriti osnovni račun."
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr "Sastavnica se nemože deaktivirati ili otkazati jer je povezana sa drugim Sastavnicama"
@@ -9735,7 +9753,7 @@ msgstr "Ne može se odbiti kada je kategorija za 'Vrednovanje' ili 'Vrednovanje
msgid "Cannot delete Exchange Gain/Loss row"
msgstr "Nije moguće izbrisati red Dobitka/Gubitka Deviznog Kursa"
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr "Ne može se izbrisati serijski broj {0}, jer se koristi u transakcijama zaliha"
@@ -10181,11 +10199,11 @@ msgstr "Lanac"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr "Kusur"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr "Promijeni Datum Izdanja"
@@ -10198,7 +10216,7 @@ msgstr "Promijeni Datum Izdanja"
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr "Promjena Vrijednosti Zaliha"
@@ -11006,6 +11024,7 @@ msgstr "Tvrtke"
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11153,6 +11172,7 @@ msgstr "Tvrtke"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11238,8 +11258,8 @@ msgstr "Tvrtke"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11555,7 +11575,7 @@ msgstr "Fiskalni Broj Tvrtke"
msgid "Company and Posting Date is mandatory"
msgstr "Tvrtka i Datum Knjiženja su obavezni"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr "Valute obje tvrtke treba da se podudaraju sa transakcijama između tvrtki."
@@ -12836,7 +12856,7 @@ msgstr "Troškovi"
#: 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12855,7 +12875,7 @@ msgstr "Troškovi"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -13068,7 +13088,7 @@ msgstr "Nije moguće izbrisati demo podatke"
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr "Nije moguće automatski kreirati klijenta zbog sljedećih nedostajućih obaveznih polja:"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr "Nije moguće automatski kreirati Kreditnu Fakturu, poništi oznaku \"Izdaj Kreditnu Fakturu\" i pošalji ponovo"
@@ -13191,15 +13211,15 @@ msgstr "Cr"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13441,7 +13461,7 @@ msgstr "Kreiraj Priliku"
msgid "Create POS Opening Entry"
msgstr "Kreiraj unos otvaranja Kase"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr "Kreiraj unos Plaćanja"
@@ -13597,7 +13617,7 @@ msgstr "Kreiranje Knjigovodstva u toku..."
msgid "Creating Delivery Note ..."
msgstr "Kreiranje Otpremnice u toku..."
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr "Kreiranje Dimenzija u toku..."
@@ -13617,7 +13637,7 @@ msgstr "Kreiranje Kupovnih Faktura u toku..."
msgid "Creating Purchase Order ..."
msgstr "Kreiranje Kupovnog Naloga u toku..."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13654,11 +13674,6 @@ msgstr "Kreiranje {} od {} {}"
msgid "Creation"
msgstr "Kreacija"
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr "Broj Dokumenta"
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr "Kreiranje {1}(s) uspješno"
@@ -13693,11 +13708,11 @@ msgstr "Kreiranje {0} nije uspjelo.\n"
msgid "Credit"
msgstr "Kredit"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr "Kredit (Transakcija)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr "Kredit ({0})"
@@ -13840,7 +13855,7 @@ msgstr "Kreditna Faktura Izdata"
msgid "Credit Note will update it's own outstanding amount, even if 'Return Against' is specified."
msgstr "Kreditna Faktura će ažurirati svoj nepodmireni iznos, čak i ako je navedeno 'Povrat Naspram'."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr "Kreditna Faktura {0} je kreirana automatski"
@@ -14048,7 +14063,7 @@ msgstr "Kup"
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14147,7 +14162,7 @@ msgstr "Valuta se ne može mijenjati nakon unosa u nekoj drugoj valuti"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr "Valuta za {0} mora biti {1}"
@@ -14497,6 +14512,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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14524,6 +14540,10 @@ msgstr "Klijent / Artikal / Artikal Grupa"
msgid "Customer / Lead Address"
msgstr "Adresa Klijenta/ Potencijalnog Klijenta"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr "Klijent > Grupa Klijenta > Područje"
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14925,7 +14945,7 @@ msgstr "Klijent je obavezan za 'Popust na osnovu Klijenta'"
#: 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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr "Klijent {0} ne pripada projektu {1}"
@@ -15277,7 +15297,7 @@ msgstr "Datum Izdavanja"
msgid "Date of Joining"
msgstr "Datum Pridruživanja"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr "Datum Transakcije"
@@ -15414,11 +15434,11 @@ msgstr "Poštovani Upravitelju Sustava,"
msgid "Debit"
msgstr "Debit"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr "Debit (Transakcija)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr "Debit ({0})"
@@ -15492,7 +15512,7 @@ msgstr "Debit prema"
msgid "Debit To is required"
msgstr "Debit prema je obavezan"
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr "Debit i Kredit nisu isti za {0} #{1}. Razlika je {2}."
@@ -16559,7 +16579,7 @@ msgstr "Demo podaci su obrisani"
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16634,9 +16654,9 @@ msgstr "Amortizacija na osnovu dnevnih proporcija"
msgid "Depreciate based on shifts"
msgstr "Amortizacija na osnovu Smjena"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr "Iznos Amortizacije"
@@ -16692,6 +16712,14 @@ msgstr "Unos Amortizacije"
msgid "Depreciation Entry Posting Status"
msgstr "Status Knjiženja Unosa Amortizacije"
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr "Unos amortizacije za imovinu {0}"
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr "Unos amortizacije za {0} u vrijednosti od {1}"
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16700,7 +16728,7 @@ msgstr "Status Knjiženja Unosa Amortizacije"
msgid "Depreciation Expense Account"
msgstr "Račun Troškova Amortizacije"
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr "Račun Troškova Amortizacije treba da bude račun Prihoda ili Rashoda."
@@ -17586,6 +17614,10 @@ msgstr "Datum Popusta"
msgid "Discount Percentage"
msgstr "Popust Precentualno"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr "Postotak popusta može se primijeniti na cjenovnik ili na cijeli cjienovnik."
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr "Postotak Popusta u Transakciji"
@@ -17818,7 +17850,7 @@ msgstr "Postavke Otpreme"
msgid "Disposal Date"
msgstr "Datum Odlaganja"
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr "Datum otuđenja {0} ne može biti prije {1} datuma {2} imovine."
@@ -18098,7 +18130,7 @@ msgstr "Dokumenti"
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr "Dokumenti se obrađuju na svakom okidaču. Veličina Reda treba biti između 5 i 100"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr "Dokumenti: {0} imaju omogućene odgođene prihode/rashode. Ne mogu ponovo objaviti."
@@ -19137,7 +19169,7 @@ msgstr "Prazno"
msgid "Ems(Pica)"
msgstr "Ems (Pica)"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr "Omogući Dozvoli Djelomičnu Rezervaciju u Postavkama Zaliha da rezervišete djelomične zalihe."
@@ -19488,7 +19520,7 @@ msgstr "Unesi naziv za Operaciju, na primjer, Rezanje."
msgid "Enter a name for this Holiday List."
msgstr "Unesi naziv za ovu Listu Praznika."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr "Unesi iznos koji želite iskoristiti."
@@ -19550,7 +19582,7 @@ msgstr "Unesi količinu artikla koja će biti proizvedena iz ovog Spiska Materij
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr "Unesi količinu za proizvodnju. Artikal sirovina će se preuzimati samo kada je ovo podešeno."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr "Unesi {0} iznos."
@@ -19570,7 +19602,7 @@ msgid "Entity"
msgstr "Entitet"
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19665,7 +19697,7 @@ msgstr "Greška pri evaluaciji formule kriterija"
msgid "Error in party matching for Bank Transaction {0}"
msgstr "Greška u podudaranju stranaka za Bankovnu Transakciju {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr "Greška prilikom knjiženja unosa amortizacije"
@@ -19717,11 +19749,9 @@ msgstr "Procijenjeno Vrijeme i Cijena"
msgid "Evaluation Period"
msgstr "Period Evaluacije"
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
-msgstr "Čak i fakture s neprovjerenim PDV po odbitku će se uzeti u obzir za provjeru kumulativnog prekoračenja praga"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
+msgstr "Čak i ako postoji više cijenovninh pravila s najvišim prioritetom, primjenjuju se sljedeći interni prioriteti:"
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
@@ -20083,7 +20113,7 @@ msgstr "Očekivana vrijednost nakon korisnog vijeka trajanja"
msgid "Expense"
msgstr "Troškovi"
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr "Račun Rashoda/ Razlike ({0}) mora biti račun 'Dobitka ili Gubitka'"
@@ -20128,7 +20158,7 @@ msgstr "Račun Rashoda/ Razlike ({0}) mora biti račun 'Dobitka ili Gubitka'"
msgid "Expense Account"
msgstr "Račun Troškova"
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr "Nedostaje Račun Troškova"
@@ -20435,7 +20465,7 @@ msgstr "Datum Kvara"
msgid "Failure Description"
msgstr "Opis Kvara"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr "Greška: {0}"
@@ -21111,6 +21141,10 @@ msgstr "Artikal Fiksne Imovine mora biti artikal koja nije na zalihama."
msgid "Fixed Asset Register"
msgstr "Registar Fiksne Imovine"
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr "Osnovno Sredstvo {0} se ne može koristiti u Sastavnicama."
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21241,7 +21275,7 @@ msgstr "Za Standard Dobavljača (Opcija)"
msgid "For Item"
msgstr "Za Artikal"
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr "Za Artikal {0} ne može se primiti više od {1} količine naspram {2} {3}"
@@ -22133,7 +22167,7 @@ msgstr "Referensa Buduće Isplate"
msgid "Future Payments"
msgstr "Buduće Isplate"
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr "Budući datum nije dozvoljen"
@@ -22149,7 +22183,7 @@ msgstr "Stanje Knjigovodstvenog Registra"
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr "Stavka Knjigovodstvenog Registra"
@@ -22415,8 +22449,8 @@ msgid "Get Items"
msgstr "Preuzmi Artikle"
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22775,7 +22809,7 @@ msgstr "Gram/Litar"
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22785,7 +22819,7 @@ msgstr "Gram/Litar"
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22906,8 +22940,8 @@ msgstr "Bruto Rezultat %"
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr "Bruto Iznos Kupovine"
@@ -23258,7 +23292,7 @@ msgstr "Hektopaskal"
msgid "Height (cm)"
msgstr "Visina (cm)"
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr "Zdravo,"
@@ -23297,7 +23331,7 @@ msgstr "Tekst Pomoći"
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr "Pomaže vam da raspodijelite Budžet/Cilj po mjesecima ako imate sezonski karakter u vašem poslovanju."
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr "Ovdje su zapisi grešaka za gore navedene neuspjele unose amortizacije: {0}"
@@ -23393,7 +23427,7 @@ msgstr "Zadrži"
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr "Zadrži Fakturu"
@@ -23487,6 +23521,10 @@ msgstr "Sati"
msgid "Hours Spent"
msgstr "Potrošeni Sati"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr "Kako se primjenjuje cjenovno pravilo?"
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23827,6 +23865,10 @@ msgstr "Ako je postavljeno, sistem će dozvoliti samo korisnicima sa ovom ulogom
msgid "If more than one package of the same type (for print)"
msgstr "Ako je više od jednog pakovanja istog tipa (za ispis)"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr "Ako se i dalje primjenjuje više pravila o cijenama, od korisnika se traži da ručno postave prioritet kako bi riješili sukob."
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23843,6 +23885,10 @@ msgstr "Ako ne, možete Otkazati / Podnijeti ovaj unos"
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr "Ako je cijena nula, artikal će se tretirati kao \"Besplatni Artikal\""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr "Ako je odabrano Cijenovno Pravilo postavljeno za 'Cijenu', ono će zamjenuti Cijenovnik. Cijenovno Pravilo cijena je konačna cijena, tako da se ne treba primjenjivati daljnji popust. Stoga će se u transakcijama poput Narudžbenice, Narudžbenice itd., cijena postaviti u polje 'Cijena', a ne u polje 'Cijena Cijenovnika'."
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23925,6 +23971,10 @@ msgstr "Ako je označeno, više materijala se može koristiti za jedan Radni Nal
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr "Ako je označeno, trošak Sastavnice će se automatski ažurirati na osnovu Stope Vrednovanja / Cijene Cijenovnika / posljednje kupovne cijene sirovina."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr "Ako se pronađu dva ili više cijenovninh pravila na osnovu gore navedenih uvjeta primjenjuje se prioritet. Prioritet je broj između 0 i 20, dok je podrazumijevana vrijednost nula (prazno). Veći broj znači da će imati prioritet ako postoji više cijenovninh pravila sa istim uvjetima."
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr "Ako je neograničen rok trajanja za bodove lojalnosti, ostavite trajanje isteka praznim ili 0."
@@ -24019,7 +24069,7 @@ msgstr "Zanemari Prazne Zalihe"
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr "Zanemari dnevnike revalorizacije deviynog tečaja i rezultata"
@@ -24071,7 +24121,7 @@ msgstr "Zanemari da je Pravilnik Cijena omogućen. Nije moguće primijeniti kod
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr "Zanemari Sistemske Kreditne/Debitne Napomene"
@@ -24834,7 +24884,7 @@ msgstr "Postavke Dolaznog Poziva"
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24907,7 +24957,7 @@ msgstr "Pogrešan Serijski i Šaržni Paket"
msgid "Incorrect Stock Value Report"
msgstr "Netačan Izvještaj o Vrijednosti Zaliha"
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr "Netačan Tip Transakcije"
@@ -25074,13 +25124,13 @@ msgstr "Ubaci Nove Zapise"
msgid "Inspected By"
msgstr "Inspektor"
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr "Inspekcija Odbijena"
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr "Inspekcija Obavezna"
@@ -25097,7 +25147,7 @@ msgstr "Inspekcija Obavezna prije Dostave"
msgid "Inspection Required before Purchase"
msgstr "Inspekcija Obavezna prije Kupovine"
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr "Podnošenje Kontrole"
@@ -25127,7 +25177,7 @@ msgstr "Napomena Instalacije"
msgid "Installation Note Item"
msgstr "Stavka Napomene Instalacije "
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr "Napomena Instalacije {0} je već poslana"
@@ -25185,7 +25235,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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "Nedovoljne Zalihe"
@@ -25376,7 +25426,7 @@ msgstr "Interni Prenosi"
msgid "Internal Work History"
msgstr "Interna Radna Istorija"
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr "Interni prenosi se mogu vršiti samo u standard valuti tvrtke"
@@ -25412,7 +25462,7 @@ msgid "Invalid Account"
msgstr "Nevažeći Račun"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr "Nevažeći Dodijeljeni Iznos"
@@ -25440,7 +25490,7 @@ msgstr "Nevažeća narudžba za odabranog Klijenta i Artikal"
msgid "Invalid Child Procedure"
msgstr "Nevažeća Podređena Procedura"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr "Nevažeća Tvrtka za transakcije između tvrtki."
@@ -25498,7 +25548,7 @@ msgid "Invalid Ledger Entries"
msgstr "Nevažeći unosi u Registar"
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr "Nevažeći Početni Unos"
@@ -25526,7 +25576,7 @@ msgstr "Nevažeća Primarna Uloga"
msgid "Invalid Priority"
msgstr "Nevažeći Prioritet"
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr "Nevažeća Konfiguracija Gubitka Procesa"
@@ -25610,8 +25660,8 @@ msgstr "Nevažeći upit pretraživanja"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr "Nevažeća vrijednost {0} za {1} naspram računa {2}"
@@ -25619,7 +25669,7 @@ msgstr "Nevažeća vrijednost {0} za {1} naspram računa {2}"
msgid "Invalid {0}"
msgstr "Nevažeći {0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr "Nevažeći {0} za transakciju izmedu tvrtki."
@@ -25829,7 +25879,7 @@ msgstr "Fakturisana Količina"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26881,6 +26931,8 @@ msgstr "Artikal Korpe"
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26899,7 +26951,11 @@ msgstr "Kod Artikla"
msgid "Item Code (Final Product)"
msgstr "Kod Artikla (Finalni Proizvod)"
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr "Šifra Artikla > Grupa Artikla > Marka"
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr "Kod Artikla ne može se promijeniti za serijski broj."
@@ -27303,6 +27359,7 @@ msgstr "Proizvođač Artikla"
#: 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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28223,7 +28280,7 @@ msgstr "Naloga Knjiženja za Otpad"
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr "Tip Naloga Knjiženja treba postaviti kao Unos Amortizacije za amortizaciju imovine"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr "Naloga Knjiženja {0} nema račun {1} ili se podudara naspram drugog verifikata"
@@ -28429,7 +28486,7 @@ msgstr "Faktura Dobavljača Kupovna Vrijednost"
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29145,7 +29202,7 @@ msgstr "Lokal"
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29816,7 +29873,7 @@ msgstr "Obavezna Knjigovodstvena Dimenzija"
msgid "Mandatory Depends On"
msgstr "Obavezno zavisi od"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr "Obavezno Polje"
@@ -29906,6 +29963,7 @@ msgstr "Ručni unos se ne može kreirati! Onemogući automatski unos za odgođen
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30464,6 +30522,7 @@ msgid "Material Requested"
msgstr "Materijal Zatražen"
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr "Materijalni Nalozi"
@@ -30819,7 +30878,7 @@ msgstr "Poruka"
msgid "Message Examples"
msgstr "Primjeri poruka"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr "Poruka Poslata"
@@ -31133,8 +31192,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr "Nedostaje Račun"
@@ -31152,6 +31211,10 @@ msgstr "Nedostaje Centar Troškova"
msgid "Missing Default in Company"
msgstr "Nedostaju Standard Postavke u Tvrtki"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr "Nedostajući Filteri"
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr "Nedostaje Finansijski Registar"
@@ -31184,7 +31247,7 @@ msgstr "Nedostajuće vrijednosti su obavezne"
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr "Nedostaje šablon e-pošte za otpremu. Molimo postavite jedan u Postavkama Dostave."
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr "Nedostaje vrijednost"
@@ -31850,7 +31913,7 @@ msgstr "Prirodni Gas"
msgid "Needs Analysis"
msgstr "Treba Analiza"
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr "Negativna količina Šarže"
@@ -32282,7 +32345,7 @@ msgstr "Novi Prodajni Nalog"
msgid "New Sales Person Name"
msgstr "Ime Novog Prodavca"
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr "Novi serijski broj ne može imati Skladište. Skladište mora biti postavljeno unosom zaliha ili Kupovnom Priznanicom"
@@ -32318,7 +32381,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 se generirati prema rasporedu čak i ako su trenutne fakture neplaćene ili sa isteklim rokom dospijeća"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr "Novi datum izlaska bi trebao biti u budućnosti"
@@ -32427,7 +32490,7 @@ msgstr "Bez Akcije"
msgid "No Answer"
msgstr "Bez Odgovora"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr "Nije pronađen Klijent za Transakcije Inter Tvrtke koji predstavlja Tvrtku {0}"
@@ -32484,9 +32547,9 @@ msgstr "Nisu pronađene neplaćene fakture za ovu stranku"
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr "Nije pronađen profil Blagajne. Kreiraj novi Profil Blagajne"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr "Bez Dozvole"
@@ -32521,7 +32584,7 @@ msgstr "Trenutno nema Dostupnih Zaliha"
msgid "No Summary"
msgstr "Nema Sažetak"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr "Nije pronađen Dobavljač za Transakcije Inter Tvrtke koji predstavlja tvrtku {0}"
@@ -32619,7 +32682,7 @@ msgstr "Nema artikala u korpi"
msgid "No items to be received are overdue"
msgstr "Nijedan od artikala za primiti ne kasni"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr "Nije došlo do podudaranja putem automatskog usaglašavanja"
@@ -32753,11 +32816,11 @@ msgstr "Nikakve transakcije Zalihama se ne mogu kreirati ili mijenjati prije ovo
msgid "No values"
msgstr "Bez Vrijednosti"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr "Nisu pronađeni {0} računi za ovu tvrtku."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr "Nije pronađen {0} za Transakcije među Tvrtkama."
@@ -32792,7 +32855,7 @@ msgstr "Ne Amortizirajuća Kategorija"
msgid "Non Profit"
msgstr "Neprofitna"
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr "Artikli koji nisu na Zalihama"
@@ -32971,7 +33034,7 @@ msgstr "Napomena: Datum dospijeća premašuje dozvoljenih {0} kreditnih dana za
msgid "Note: Email will not be sent to disabled users"
msgstr "Napomena: E-pošta se neće slati onemogućenim korisnicima"
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr "Napomena: Ako želite koristiti gotov proizvod {0} kao sirovinu, označite polje za potvrdu 'Ne Proširuj' u Postavkama Artikla za istu sirovinu."
@@ -32991,7 +33054,7 @@ msgstr "Napomena: Ovaj Centar Troškova je Grupa. Ne mogu se izvršiti knjigovod
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr "Napomena: Da biste spojili artikle, kreirajte zasebno Usaglašavanje Zaliha za stari artikal {0}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr "Napomena: {0}"
@@ -33007,6 +33070,7 @@ msgstr "Napomena: {0}"
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33442,6 +33506,12 @@ msgstr "U transakciji su dozvoljeni samo podređeni članovi"
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr "Samo jedan {0} unos se može kreirati naspram Radnog Naloga {1}"
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr "Za provjeru prekoračenja kumulativnog praga uzimat će se u obzir samo uplate s neoznačenom opcijom \"Primijeni porez po odbitku\""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33644,8 +33714,8 @@ msgstr "Početno (Dr)"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr "Početna Akumulirana Amortizacija"
@@ -33687,7 +33757,7 @@ msgstr "Datum Otvaranja"
msgid "Opening Entry"
msgstr "Početni Unos"
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr "Početni Unos ne može se kreirati nakon kreiranja Verifikata Zatvaranje Perioda."
@@ -33715,7 +33785,7 @@ msgid "Opening Invoice Item"
msgstr "Početni Artikal Fakture"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 podešavanje zaokruživanja od {0}.
'{1}' račun je potreban za postavljanje ovih vrijednosti. Molimo postavite ga u kompaniji: {2}.
Ili, '{3}' se može omogućiti da se ne objavljuje nikakvo podešavanje zaokruživanja."
@@ -33789,7 +33859,7 @@ msgstr "Operativni Trošak (Valuta Tvrtke)"
msgid "Operating Cost Per BOM Quantity"
msgstr "Operativni trošak po količini Sastavnice"
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr "Operativni Trošak prema Radnom Nalogu / Sastavnici"
@@ -33945,7 +34015,7 @@ msgstr "Operacije"
msgid "Operations Routing"
msgstr "Redoslijed Operacija"
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr "Operacije se ne mogu ostaviti praznim"
@@ -34537,7 +34607,7 @@ msgstr "Dozvola za prekomjernu Dostavu/Primanje (%)"
msgid "Over Picking Allowance"
msgstr "Dozvola za prekomjernu Odabir"
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr "Preko Dostavnice"
@@ -34989,7 +35059,7 @@ msgstr "Upakovani Artikal"
msgid "Packed Items"
msgstr "Upakovani Artikli"
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr "Upakovani Artikli se ne mogu interno prenositi"
@@ -35024,7 +35094,7 @@ msgstr "Otpremnica"
msgid "Packing Slip Item"
msgstr "Artikal Otpremnice"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr "Otpremnica otkazana"
@@ -35110,7 +35180,7 @@ msgstr "Plaćeno"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35385,7 +35455,7 @@ msgstr "Djelomični Prenesen Materijal"
msgid "Partial Payment in POS Transactions are not allowed."
msgstr "Djelomično plaćanje u Transakcijama Blagajne nije dozvoljeno."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr "Djelomična Rezervacija Zaliha"
@@ -35579,9 +35649,9 @@ msgstr "Dijelova na Milion"
#: 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35742,9 +35812,9 @@ msgstr "Specifični Artikal 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35909,7 +35979,7 @@ msgstr "Postavke Platitelja"
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -36045,7 +36115,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr "Unos plaćanja je izmijenjen nakon što ste ga povukli. Molim te povuci ponovo."
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr "Unos plaćanja je već kreiran"
@@ -36254,7 +36324,7 @@ msgstr "Reference Uplate"
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36280,11 +36350,11 @@ msgstr "Tip Zahtjeva Plaćanja"
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr "Platni Nalog je kreiran iz Prodajnog ili Kupovnog Naloga bit će u statusu Nacrta. Kada je onemogućen, dokument će biti u nespremljnom stanju."
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr "Platni Zahtjev za {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr "Platni Zahtjev je već kreiran"
@@ -36442,7 +36512,7 @@ msgstr "URL Plaćanja"
msgid "Payment Unlink Error"
msgstr "Greška Otkazivanja Veze"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr "Plaćanje naspram {0} {1} ne može biti veće od Nepodmirenog Iznosa {2}"
@@ -36763,7 +36833,7 @@ msgstr "Razdoblje"
msgid "Period Based On"
msgstr "Period na Osnovu"
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr "Period Zatvoren"
@@ -37366,7 +37436,7 @@ msgstr "Dodaj Račun Matičnoj Tvrtki - {}"
msgid "Please add {1} role to user {0}."
msgstr "Dodaj {1} ulogu korisniku {0}."
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr "Podesi količinu ili uredi {0} da nastavite."
@@ -37374,7 +37444,7 @@ msgstr "Podesi količinu ili uredi {0} da nastavite."
msgid "Please attach CSV file"
msgstr "Priložite CSV datoteku"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr "Poništi i Izmijeni Unos Plaćanja"
@@ -37387,7 +37457,7 @@ msgstr "Ručno otkaži Unos Plaćanja"
msgid "Please cancel related transaction."
msgstr "Otkaži povezanu transakciju."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr "Odaberi opciju Više Valuta da dozvolite račune u drugoj valuti"
@@ -37464,7 +37534,7 @@ msgstr "Kreiraj Kupovni Račun ili Kupovnu Fakturu za artikal {0}"
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr "Izbriši Artikal Paket {0}, prije spajanja {1} u {2}"
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr "Molimo vas da privremeno onemogućite tijek rada za Nalog Knjiženja {0}"
@@ -37588,7 +37658,7 @@ msgstr "Unesi Kupovni Račun"
msgid "Please enter Receipt Document"
msgstr "Unesi Kupovni Račun"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr "Unesi Referentni Datum"
@@ -37713,8 +37783,8 @@ msgstr "Da li zaista želiš izbrisati sve transakcije za ovu tvrtku. Vaši glav
msgid "Please mention 'Weight UOM' along with Weight."
msgstr "Navedi 'Jedinicu Težine' zajedno s Težinom."
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr "Navedi '{0}' u Tvrtki: {1}"
@@ -37842,7 +37912,7 @@ msgstr "Odaberi Datum knjiženja prije odabira Stranke"
msgid "Please select Posting Date first"
msgstr "Odaberi Datum Knjiženja"
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr "Odaberi Cjenovnik"
@@ -37874,7 +37944,7 @@ msgstr "Odaberi Podizvođački umjesto Kupovnog Naloga {0}"
msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
msgstr "Odaberi Račun Nerealiziranog Rezultata ili postavi Standard Račun Nerealiziranog Rezultata za tvrtku {0}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr "Odaberi Sastavnicu"
@@ -37964,6 +38034,10 @@ msgstr "Odaberi Vrijednost za {0} Ponuda za {1}"
msgid "Please select an item code before setting the warehouse."
msgstr "Odaberite kod artikla prije postavljanja skladišta."
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:26
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr "Molimo odaberite barem jedan filter: Šifra Artikla, Šarža ili Serijski Broj."
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr "Odaberi jedan artikal za nastavak"
@@ -37972,7 +38046,7 @@ msgstr "Odaberi jedan artikal za nastavak"
msgid "Please select atleast one operation to create Job Card"
msgstr "Odaberi barem jednu operaciju za izradu kartice posla"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr "Odaberi tačan račun"
@@ -38053,15 +38127,15 @@ msgstr "Odaberi {0}"
msgid "Please set 'Apply Additional Discount On'"
msgstr "Postavi 'Primijeni Dodatni Popust Na'"
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr "Postavi 'Centar Troškova Amortizacije Imovine' u tvrtki {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr "Postavi 'Račun Rezultata Prilikom Odlaganja Imovine' u Tvrtki {0}"
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr "Postavi '{0}' u Tvrtki: {1}"
@@ -38069,7 +38143,7 @@ msgstr "Postavi '{0}' u Tvrtki: {1}"
msgid "Please set Account"
msgstr "Postavi Račun"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr "Postavi Račun za Kusur"
@@ -38095,7 +38169,7 @@ msgstr "Postavi Knjigovodstvenu Dimenziju {} u {}"
msgid "Please set Company"
msgstr "Postavi Tvrtku"
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr "Postavi račune koji se odnose na Amortizaciju u Kategoriji Imovine {0} ili Tvrtke {1}"
@@ -38113,7 +38187,7 @@ msgstr "Postavi Fiskalni Kod za Klijenta '%s'"
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr "Postavi Fiskalni Kod za Javnu Upravu '%s'"
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr "Postavi Račun Osnovne Imovine u Kategoriju Imovine {0}"
@@ -38176,7 +38250,7 @@ msgstr "Postavi Račun u Skladištu {0}"
msgid "Please set an Address on the Company '%s'"
msgstr "Postavi Adresu Tvrtke '%s'"
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr "Postavi Račun Troškova u tabeli Artikala"
@@ -38192,23 +38266,23 @@ msgstr "Postavi barem jedan red u Tabeli PDV-a i Naknada"
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr "Postavi Porezni i Fiskalni Broj za {0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr "Postavi Standard Gotovinski ili Bankovni Račun za Način Plaćanja {0}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr "Postavi Standard Gotovinski ili Bankovni Račun za Način Plaćanja {}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "Postavi Standard Gotovinski ili Bankovni Račun za Načine Plaćanja {}"
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr "Postavi Standard Račun Rezultata u Tvrtki {}"
@@ -38312,7 +38386,7 @@ msgstr "Postavi {0} na {1}, isti račun koji je korišten u originalnoj fakturi
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr "Podesi i omogući grupni račun sa Kontnom Klasom - {0} za Tvrtku {1}"
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr "Podijeli ovu e-poštu sa svojim timom za podršku kako bi mogli pronaći i riješiti problem."
@@ -38325,7 +38399,7 @@ msgid "Please specify Company"
msgstr "Navedi Tvrtku"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr "Navedi Tvrtku za nastavak"
@@ -38498,6 +38572,7 @@ msgstr "Poštanski Troškovi"
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38532,11 +38607,11 @@ 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38555,6 +38630,7 @@ msgstr "Poštanski Troškovi"
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38564,6 +38640,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_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
@@ -39129,6 +39206,14 @@ msgstr "Kod Artikla Pravila Određivanja Cijena"
msgid "Pricing Rule Item Group"
msgstr "Grupa Artikal Pravila Određivanja Cijena"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr "Cijenovno Pravilo se prvo bira na osnovu polja 'Primijeni na', koje može biti Artikal, Grupa Artikla ili Marka."
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr "Cijenovno Pravilo je napravljeno da zamjeni cijenovnik / definiše ppostotak popusta, na temelju određenih kriterija."
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr "Pravilo Određivanja Cijena {0} je ažurirano"
@@ -39187,6 +39272,10 @@ msgstr "Pravilo Određivanja Cijena {0} je ažurirano"
msgid "Pricing Rules"
msgstr "Pravila Određivanja Cijena"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr "Cijenovna Pravila se dalje filtriraju na temelju količine."
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39574,7 +39663,7 @@ msgstr "Opis Procesa"
msgid "Process Loss"
msgstr "Procesni Gubitak"
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr "Procentualni Gubitka Procesa ne može biti veći od 100"
@@ -40064,7 +40153,7 @@ msgstr "Napredak (%)"
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40539,7 +40628,7 @@ msgstr "Analiza Kupovine"
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr "Datum Kupovine"
@@ -40695,7 +40784,7 @@ msgstr "Glavni Upravitelj Nabave"
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40871,9 +40960,9 @@ msgstr "Kupovni Cijenovnik"
#. 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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41754,6 +41843,7 @@ msgstr "Cilj Revizije 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/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
@@ -41870,7 +41960,7 @@ msgstr "Količina ne smije biti veća od {0}"
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr "Količina artikla dobijena nakon proizvodnje/prepakivanja od datih količina sirovina"
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr "Obavezna Količina za Artikal {0} u redu {1}"
@@ -42719,7 +42809,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:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "Razlog za Stavljanje Na Čekanje"
@@ -43155,7 +43245,7 @@ msgstr "Iskoristi Naspram"
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr "Iskoristi Bodove Lojalnosti"
@@ -43287,7 +43377,7 @@ msgstr "Referentni Datum"
msgid "Reference"
msgstr "Referenca"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr "Referenca #{0} datirana {1}"
@@ -43425,7 +43515,7 @@ msgstr "Referentni Naziv"
msgid "Reference No"
msgstr "Referentni Broj"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr "Referentni Broj & Referentni Datum su obavezni za {0}"
@@ -43433,11 +43523,11 @@ msgstr "Referentni Broj & Referentni Datum su obavezni za {0}"
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr "Referentni Broj i Referentni Datum su obavezni za Bankovnu Transakciju"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr "Referentni Broj je obavezan ako ste unijeli Referentni Datum"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr "Referentni Broj"
@@ -43551,11 +43641,11 @@ msgstr "Referenca: {0}, Artikal Kod: {1} i Klijent: {2}"
msgid "References"
msgstr "Reference"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr "Reference na Prodajne Fakture su Nepotpune"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr "Reference na Prodajne Naloge su Nepotpune"
@@ -43700,8 +43790,8 @@ msgstr "U Relaciji"
#. 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43720,7 +43810,7 @@ msgstr "Datum Otkaza"
msgid "Remaining"
msgstr "Preostalo"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr "Preostali Iznos"
@@ -43733,7 +43823,7 @@ msgstr "Preostalo Stanje"
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr "Napomena"
@@ -43782,7 +43872,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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -44094,7 +44184,7 @@ msgstr "Artikal Ponovnog Knjiženja Registra Plaćanja"
msgid "Repost Status"
msgstr "Status Ponovnog Knjiženja"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr "Ponovno Knjiženje je započeto u pozadini"
@@ -44418,7 +44508,7 @@ msgstr "Ponovo odaberi, ako je odabrani kontakt izmenjen nakon čuvanja"
msgid "Reseller"
msgstr "Preprodavač"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr "Ponovo pošaljite e-poštu za plaćanje"
@@ -44887,7 +44977,7 @@ msgstr "Povrat"
msgid "Return / Credit Note"
msgstr "Povrat / Kreditna Faktura"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr "Povrat / Debit Faktura"
@@ -45411,12 +45501,12 @@ 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/sales_invoice/sales_invoice.py:1920
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1919
msgid "Row #{0} (Payment Table): Amount must be negative"
msgstr "Red #{0} (Tabela Plaćanja): Iznos mora da je negativan"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:515
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "Red #{0} (Tabela Plaćanja): Iznos mora da je pozitivan"
@@ -45562,7 +45652,7 @@ msgstr "Red #{0}: Duplikat unosa u Referencama {1} {2}"
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr "Red #{0}: Očekivani Datum Isporuke ne može biti prije datuma Kupovnog Naloga"
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr "Red #{0}: Račun Troškova nije postavljen za artikal {1}. {2}"
@@ -45586,11 +45676,11 @@ msgstr "Red #{0}: Gotov Proizvod mora biti {1}"
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr "Red #{0}: Gotov Proizvod referenca je obavezna za Otpadni Artikal {1}."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr "Red #{0}: Za {1}, možete odabrati referentni dokument samo ako je račun kreditiran"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr "Red #{0}: Za {1}, možete odabrati referentni dokument samo ako račun bude zadužen"
@@ -45610,7 +45700,7 @@ msgstr "Red #{0}: Artikel je dodan"
msgid "Row #{0}: Item {1} does not exist"
msgstr "Red #{0}: Artikel {1} ne postoji"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr "Red #{0}: Artikal {1} je odabran, rezerviši zalihe sa Liste Odabira."
@@ -45646,7 +45736,7 @@ msgstr "Red #{0}: Sljedeći datum amortizacije ne može biti prije datuma kupnje
msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
msgstr "Red #{0}: Nije dozvoljeno mijenjati dobavljača jer Kupovni Nalog već postoji"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr "Red #{0}: Samo {1} je dostupno za rezervisanje za artikal {2}"
@@ -45691,15 +45781,15 @@ msgstr "Red #{0}: Količina mora biti pozitivan broj"
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 bi trebala biti manja ili jednaka Dostupnoj Količini za Rezervaciju (stvarna količina - rezervisana količina) {1} za artikal {2} naspram Šarže {3} u Skladištu {4}."
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr "Red #{0}: Kontrola Kvaliteta je obavezna za artikal {1}"
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr "Red #{0}: Kontrola kKvaliteta {1} nije dostavljena za artikal: {2}"
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr "Red #{0}: Kontrola Kvaliteta {1} je odbijena za artikal {2}"
@@ -45708,7 +45798,7 @@ msgstr "Red #{0}: Kontrola Kvaliteta {1} je odbijena za artikal {2}"
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "Red #{0}: Količina za artikal {1} ne može biti nula."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr "Red #{0}: Količina koju treba rezervisati za artikal {1} treba biti veća od 0."
@@ -45805,19 +45895,19 @@ msgstr "Red #{0}: Status mora biti {1} za popust na fakturi {2}"
msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}."
msgstr "Red #{0}: Zaliha se ne može rezervisati za artikal {1} naspram onemogućene Šarže {2}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr "Red #{0}: Zalihe se ne mogu rezervirati za artikal bez zaliha {1}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr "Red #{0}: Zalihe se ne mogu rezervisati u grupnom skladištu {1}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr "Red #{0}: Zaliha je već rezervisana za artikal {1}."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr "Red #{0}: Zalihe su rezervisane za artikal {1} u skladištu {2}."
@@ -45825,8 +45915,8 @@ msgstr "Red #{0}: Zalihe su rezervisane za artikal {1} u skladištu {2}."
msgid "Row #{0}: Stock not available to reserve for Item {1} against Batch {2} in Warehouse {3}."
msgstr "Red #{0}: Zaliha nije dostupna za rezervisanje za artikal {1} naspram Šarže {2} u Skladištu {3}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr "Red #{0}: Zaliha nije dostupna za rezervisanje za artikal {1} u skladištu {2}."
@@ -46007,7 +46097,7 @@ msgstr "Red {0}# Artikal {1} nije pronađen u tabeli 'Isporučene Sirovine' u {2
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr "Red {0}: Prihvaćena Količina i Odbijena Količina ne mogu biti nula u isto vrijeme."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr "Red {0}: Račun {1} i Tip Stranke {2} imaju različite tipove računa"
@@ -46015,11 +46105,11 @@ msgstr "Red {0}: Račun {1} i Tip Stranke {2} imaju različite tipove računa"
msgid "Row {0}: Activity Type is mandatory."
msgstr "Red {0}: Tip Aktivnosti je obavezan."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr "Red {0}: Predujam naspram Klijenta mora biti kredit"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr "Red {0}: Predujam naspram Dobavljača mora biti debit"
@@ -46039,7 +46129,7 @@ msgstr "Red {0}: Kako je {1} omogućen, sirovine se ne mogu dodati u {2} unos. K
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr "Red {0}: Sastavnica nije pronađena za Artikal {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr "Red {0}: Vrijednosti debita i kredita ne mogu biti nula"
@@ -46055,7 +46145,7 @@ msgstr "Red {0}: Centar Troškova {1} ne pripada tvrtki {2}"
msgid "Row {0}: Cost center is required for an item {1}"
msgstr "Red {0}: Centar Troškova je obaveyan za artikal {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr "Red {0}: Unos kredita ne može se povezati sa {1}"
@@ -46063,7 +46153,7 @@ msgstr "Red {0}: Unos kredita ne može se povezati sa {1}"
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr "Red {0}: Valuta Sastavnice #{1} bi trebala biti jednaka odabranoj valuti {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr "Red {0}: Unos debita ne može se povezati sa {1}"
@@ -46079,7 +46169,7 @@ msgstr "Red {0}: Datum roka plaćanja u tabeli Uslovi Plaćanja ne može biti pr
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr "Red {0}: Ili je Artikal Dostavnice ili Pakirani Artikal referenca obavezna."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "Red {0}: Devizni Kurs je obavezan"
@@ -46113,7 +46203,7 @@ msgstr "Red {0}: Od vremena i do vremena je obavezano."
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr "Red {0}: Od vremena i do vremena {1} se preklapa sa {2}"
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr "Red {0}: Iz skladišta je obavezano za interne prijenose"
@@ -46125,7 +46215,7 @@ msgstr "Red {0}: Od vremena mora biti prije do vremena"
msgid "Row {0}: Hours value must be greater than zero."
msgstr "Red {0}: Vrijednost sati mora biti veća od nule."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr "Red {0}: Nevažeća referenca {1}"
@@ -46149,7 +46239,7 @@ msgstr "Red {0}: Artikal {1} mora biti podugovorni artikal."
msgid "Row {0}: Item {1}'s quantity cannot be higher than the available quantity."
msgstr "Red {0}: Količina Artikla {1} ne može biti veća od raspoložive količine."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr "Red {0}: Pakovana Količina mora biti jednaka {1} Količini."
@@ -46157,7 +46247,7 @@ msgstr "Red {0}: Pakovana Količina mora biti jednaka {1} Količini."
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr "Red {0}: Otpremnica je već kreirana za artikal {1}."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr "Red {0}: Strana/ Račun se ne podudara sa {1} / {2} u {3} {4}"
@@ -46169,11 +46259,11 @@ msgstr "Red {0}: Tip Stranke i Stranka su obavezni za Račun Potraživanja / Pla
msgid "Row {0}: Payment Term is mandatory"
msgstr "Red {0}: Uslov Plaćanja je obavezan"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr "Red {0}: Plaćanje naspram Prodajnog/Kupovnog Naloga uvijek treba navesti kao predujam"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr "Red {0}: Provjeri 'Predujam' naspram računa {1} ako je ovo predujam unos."
@@ -46241,7 +46331,7 @@ msgstr "Red {0}: Smjena se ne može promijeniti jer je amortizacija već obrađe
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr "Red {0}: Podugovorni Artikal je obavezan za sirovinu {1}"
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr "Red {0}: Ciljno Skladište je obavezno za interne transfere"
@@ -46265,7 +46355,7 @@ msgstr "Red {0}: Za postavljanje {1} periodičnosti, razlika između od i do dat
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "Red {0}: Jedinični Faktor Konverzije je obavezan"
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: 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 Tip Radne Stanice je obavezan za operaciju {1}"
@@ -46286,7 +46376,7 @@ msgstr "Red {0}: {1} mora biti veći od 0"
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr "Red {0}: {1} {2} ne može biti isto kao {3} (Račun Stranke) {4}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr "Red {0}: {1} {2} se ne podudara sa {3}"
@@ -46679,7 +46769,7 @@ msgstr "Prodajna Faktura nije izrađena od {}"
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr "U Kasi je aktiviran način Prodajne Fakture. Umjesto toga kreiraj Prodajnu Fakturu."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr "Prodajna Faktura {0} je već podnešena"
@@ -46908,7 +46998,7 @@ msgstr "Status Prodajnog Naloga"
msgid "Sales Order Trends"
msgstr "Trendovi Prodajnih Naloga"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr "Prodajni Nalog je obavezan za Artikal {0}"
@@ -47418,8 +47508,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47692,7 +47782,7 @@ msgstr "Trošak Otpadnog Materijala (Valuta Tvrtke)"
msgid "Scrap Warehouse"
msgstr "Otpadno Skladište"
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr "Datum Rashodovanja ne može biti prije Datuma Kupovine"
@@ -47765,7 +47855,7 @@ msgstr "Sekretar(ica)"
msgid "Section"
msgstr "Sekcija"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr "Kod Sekcije"
@@ -48136,7 +48226,7 @@ msgstr "Odaberi, kako bi mogao pretraživati klijenta pomoću ovih polja"
msgid "Selected POS Opening Entry should be open."
msgstr "Odabrani Početni Unos Kase bi trebao biti otvoren."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr "Odabrani Cijenovnik treba da ima označena polja za Kupovinu i Prodaju."
@@ -48320,7 +48410,7 @@ msgstr "Pošalji sa Prilogom"
msgid "Sender"
msgstr "Pošiljalac"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr "Šalje se"
@@ -48444,7 +48534,9 @@ msgstr "Serijski / Šaržni Broj"
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48475,7 +48567,9 @@ msgid "Serial No Count"
msgstr "Broj Serijskog Broja"
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr "Serijski Broj Registar"
@@ -48483,7 +48577,7 @@ msgstr "Serijski Broj Registar"
msgid "Serial No Range"
msgstr "Serijski Broj Raspon"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr "Rezervisan Serijski Broj"
@@ -48523,6 +48617,13 @@ msgstr "Serijski Broj i Šarža"
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr "Serijski Broj i odabirač Šarže ne mogu se koristiti kada je omogućeno Koristi Serijski Broj / Šaržna Polja."
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr "Sljedjivost Serijskog Broja i Šarže"
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr "Serijski Broj je Obavezan"
@@ -48552,7 +48653,7 @@ msgstr "Serijski Broj {0} ne pripada Artiklu {1}"
msgid "Serial No {0} does not exist"
msgstr "Serijski Broj {0} ne postoji"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr "Serijski Broj {0} ne postoji"
@@ -48601,7 +48702,7 @@ msgstr "Serijski Broj / Šaržni Broj"
msgid "Serial Nos and Batches"
msgstr "Serijski Brojevi & Šarže"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr "Serijski Brojevi su uspješno kreirani"
@@ -48679,11 +48780,11 @@ msgstr "Serijski i Šarža"
msgid "Serial and Batch Bundle"
msgstr "Serijski i Šaržni Paket"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr "Serijski i Šaržni Paket je kreiran"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr "Serijski i Šaržni Paket je ažuriran"
@@ -49117,7 +49218,7 @@ msgstr "Odredi obračunatu cijenu na temelju cijene Kupovne Fakture"
msgid "Set Loyalty Program"
msgstr "Postavi Program Lojalnosti"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr "Postavi Novi Datum Izdavanja"
@@ -49372,7 +49473,7 @@ msgstr "Postavljanje računa kao Računa Tvrtke je neophodno za Bankovno Usagla
msgid "Setting up company"
msgstr "Postavljanje Tvrtke"
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr "Postavka {0} je obavezna"
@@ -49556,7 +49657,7 @@ msgstr "Tip Pošiljke"
msgid "Shipment details"
msgstr "Detalji Pošiljke"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr "Pošiljke"
@@ -49803,6 +49904,10 @@ msgstr "Prikaži Otkazane Unose"
msgid "Show Completed"
msgstr "Prikaži Završeno"
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr "Prikaži Kredit / Debit u valuti tvrtke"
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr "Prikaži Kumulativni Iznos"
@@ -49918,7 +50023,7 @@ msgstr "Prikaži Pregled"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr "Prikaži Napomene"
@@ -50225,13 +50330,27 @@ msgstr "Izvor"
msgid "Source DocType"
msgstr "Izvorni DocType"
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr "Izvorni Dokument"
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr "Naziv Izvornog Dokumenta"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr "Broj Izvornog Dokumenta"
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr "Tip Izvornog Dokumenta"
@@ -50302,7 +50421,7 @@ msgstr "Adresa Izvornog Skladišta"
msgid "Source Warehouse Address Link"
msgstr "Veza Adrese Izvornog Skladišta"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr "Izvorno Skladište je obavezno za Artikal {0}."
@@ -50813,7 +50932,7 @@ msgstr "Država/Pokrajina"
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51156,7 +51275,7 @@ msgstr "Unos Zaliha {0} je kreiran"
msgid "Stock Entry {0} has created"
msgstr "Unos Zaliha {0} je kreiran"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr "Unos Zaliha {0} nije podnešen"
@@ -51379,13 +51498,13 @@ msgstr "Postavke Ponovnog Knjiženja Zaliha"
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51394,13 +51513,13 @@ msgstr "Postavke Ponovnog Knjiženja Zaliha"
msgid "Stock Reservation"
msgstr "Rezervacija Zaliha"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr "Otkazani Unosi Rezervacije Zaliha"
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr "Kreirani Unosi Rezervacija Zaliha"
@@ -51422,7 +51541,7 @@ msgstr "Unos Rezervacije Zaliha ne može se ažurirati pošto je već dostavljen
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 naspram Liste Odabira ne može se ažurirati. Ako trebate napraviti promjene, preporučujemo da poništite postojeći unos i kreirate novi."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr " Neusklađeno Skladišta Rezervacije Zaliha"
@@ -51667,7 +51786,7 @@ msgstr "Zalihe i Proizvodnja"
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr "Zalihe se ne mogu rezervisati u grupnom skladištu {0}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr "Zalihe se ne mogu rezervisati u grupnom skladištu {0}."
@@ -51683,7 +51802,7 @@ msgstr "Zalihe se ne mogu ažurirati naspram sljedećih Dostavnica: {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 se ne mogu ažurirati jer Faktura sadrži artikal direktne dostave. Onemogući 'Ažuriraj Zalihe' ili ukloni artikal direktne dostave."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr "Rezervisana Zaliha je poništena za Radni Nalog {0}."
@@ -52551,10 +52670,15 @@ msgstr "Dostavljena 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "Dobavljač"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr "Dobavljač > Tip Dobavljača"
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52667,7 +52791,7 @@ msgstr "Faktura Dobavljača"
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr "Datum Fakture Dobavljaća"
@@ -52681,8 +52805,8 @@ msgstr "Datum Fakture Dobavljača ne može biti kasnije od Datuma Knjiženja"
#: 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "Broj Fakture Dobavljača"
@@ -53230,16 +53354,16 @@ msgstr "Sustav neće provjeravati prekomjerno fakturisanje jer je iznos za Artik
msgid "System will notify to increase or decrease quantity or amount "
msgstr "Sustav će obavijestiti da li da se poveća ili smanji količinu ili iznos "
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr "Iznos PDV-a po odbitku (TCS)"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr "Stopa poreza po odbitku (TCS) %"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr "Iznos poreza po odbitku (TDS)"
@@ -53256,7 +53380,7 @@ msgstr "Odbijen porez po odbitku (TDS)"
msgid "TDS Payable"
msgstr "Dospjeli porez po odbitku (TDS)."
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr "Stopa poreza po odbitku (TDS) %"
@@ -53812,7 +53936,7 @@ msgstr "Tip PDV-a"
msgid "Tax Withheld Vouchers"
msgstr "Verifikati PDV Odbitka"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr "PDV Odbitak"
@@ -54438,7 +54562,7 @@ msgstr "Pristup zahtjevu za ponudu sa portala je onemogućen. Da biste omogućil
msgid "The BOM which will be replaced"
msgstr "Sastavnica koja će biti zamijenjena"
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr "Šarća {0} ima negativnu količinu {1} u skladištu {2}. Ispravi količinu."
@@ -54466,7 +54590,7 @@ msgstr "Knjigovodstveni Unosi će biti otkazani u pozadini, može potrajati neko
msgid "The Loyalty Program isn't valid for the selected company"
msgstr "Program Lojalnosti ne važi za odabranu tvrtku"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr "Zahtjev Plaćanja {0} je već plaćen, ne može se obraditi plaćanje dvaput"
@@ -54490,7 +54614,7 @@ msgstr "Prodavač je povezan sa {0}"
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr "Serijski Broj u redu #{0}: {1} nije dostupan u skladištu {2}."
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr "Serijski Broj {0} je rezervisan naspram {1} {2} i ne može se koristiti za bilo koju drugu transakciju."
@@ -54512,7 +54636,7 @@ msgstr "Radni Nalog je obavezan za Demontažni Nalog"
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr "Računa pod Obavezama ili Kapitalom, u kojoj će se knjižiti Rezultat"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr "Dodijeljeni iznos je veći od nepodmirenog iznosa Zahtjeva Plaćanja {0}"
@@ -54553,7 +54677,7 @@ msgstr "Polje Od Dioničara ne može biti prazno"
msgid "The field To Shareholder cannot be blank"
msgstr "Polje Za Dioničara ne može biti prazno"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr "Polje {0} u redu {1} nije postavljeno"
@@ -54569,7 +54693,7 @@ msgstr "Brojevi Folija se ne podudaraju"
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr "Sljedeći artikl, koji imaju Pravila Odlaganju, nisu mogli biti prihvaćeni:"
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr "Sljedeća imovina nije uspjela automatski knjižiti unose amortizacije: {0}"
@@ -54830,6 +54954,10 @@ msgstr "{0} {1} se ne poklapa s {0} {2} u {3} {4}"
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr "{0} {1} se koristi za izračunavanje troška vrednovanja za gotov proizvod {2}."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc."
+msgstr "Zatim se cijenovna pravila filtriraju na osnovu klijenta, grupe klijenta, distrikta, dobavljača, tipa dobavljača, tvrtke, prodajnog partnera itd."
+
#: erpnext/assets/doctype/asset/asset.py:579
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr "Postoji aktivno održavanje ili popravke imovine naspram imovine. Morate ih ispuniti sve prije nego što otkažete imovinu."
@@ -55096,7 +55224,7 @@ msgstr "Ovaj raspored je kreiran kada je imovina {0} vraćena zbog otkazivanja p
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr "Ovaj raspored je kreiran kada je imovina {0} vraćena nakon otkazivanja kapitalizacije imovine {1}."
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr "Ovaj raspored je kreiran kada je Imovina {0} vraćena."
@@ -55104,7 +55232,7 @@ msgstr "Ovaj raspored je kreiran kada je Imovina {0} vraćena."
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr "Ovaj raspored je kreiran kada je imovina {0} vraćena putem Prodajne Fakture {1}."
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr "Ovaj raspored je kreiran kada je imovina {0} rashodovana."
@@ -55879,6 +56007,10 @@ msgstr "Da biste uključili PDV u red {0} u cijenu artikla, PDV u redovima {1} t
msgid "To merge, following properties must be same for both items"
msgstr "Za spajanje, sljedeća svojstva moraju biti ista za obje stavke"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr "Da se cijenovno pravilo ne primjeni u određenoj transakciji, sva primenjiva cijenovna pravila treba onemogućiti."
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr "Da poništite ovo, omogućite '{0}' u tvrtki {1}"
@@ -55896,7 +56028,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr "Da biste podnijeli Fakturu bez Kupovnog Računa, postavite {0} kao {1} u {2}"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr "Da biste koristili drugi Finansijski Registar, poništi 'Uključi Standard Imovinu Finansijskog Registra'"
@@ -56118,7 +56250,7 @@ msgstr "Ukupno Dodjeljeno"
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56280,7 +56412,7 @@ msgstr "Ukupni iznos Kredita/Debita trebao bi biti isti kao povezani Nalog Knji
msgid "Total Debit"
msgstr "Ukupan Debit"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr "Ukupan Debit mora biti jednak Ukupnom Kreditu. Razlika je {0}"
@@ -56873,6 +57005,10 @@ msgstr "Ukupno"
msgid "Traceability"
msgstr "Sljedivost"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr "Smjer Sljedivosti"
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56913,7 +57049,7 @@ msgstr "URL Praćenja"
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -57011,7 +57147,7 @@ msgstr "Postavke Transakcije"
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr "Tip Transakcije"
@@ -57033,7 +57169,7 @@ msgstr "Referentni broj transakcije {0} datiran {1}"
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57630,7 +57766,11 @@ msgstr "Nedodjeljeni Iznos"
msgid "Unassigned Qty"
msgstr "Nedodijeljena Količina"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr "Nefakturirani Nalozi"
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr "Deblokiraj Fakturu"
@@ -58997,7 +59137,7 @@ msgstr "Faktura Dobavljača"
msgid "Vendor Invoices"
msgstr "Fakture Dobavljača"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr "Ime Dobavljača"
@@ -59064,7 +59204,7 @@ msgstr "Video Postavke"
#: 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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59255,11 +59395,11 @@ msgstr "Naziv Verifikata"
#: 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59294,7 +59434,7 @@ msgstr "Količina"
#. 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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr "Podtip Verifikata"
@@ -59326,9 +59466,9 @@ msgstr "Podtip Verifikata"
#: 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59347,6 +59487,7 @@ msgstr "Podtip Verifikata"
#: 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_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
@@ -59556,6 +59697,7 @@ msgstr "Spontana Posjeta"
#: 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_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
@@ -59664,7 +59806,7 @@ msgstr "Skladište i Referenca"
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr "Skladište se ne može izbrisati jer postoji unos u registru zaliha za ovo skladište."
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr "Skladište se ne može promijeniti za Serijski Broj."
@@ -59677,7 +59819,7 @@ msgid "Warehouse not found against the account {0}"
msgstr "Skladište nije pronađeno naspram računu {0}"
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr "Skladište je obavezno za artikal zaliha {0}"
@@ -59828,7 +59970,7 @@ msgstr "Upozorenje na Negativnu Zalihu"
msgid "Warning!"
msgstr "Upozorenje!"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr "Upozorenje: Još jedan {0} # {1} postoji naspram unosa zaliha {2}"
@@ -60311,6 +60453,7 @@ msgstr "Skladište Posla u Toku"
#: 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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "Radni Nalog"
@@ -60786,7 +60929,7 @@ msgstr "Uvoziš podatke za Listu Koda:"
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr "Nije vam dozvoljeno ažuriranje prema uslovima postavljenim u {} Radnom Toku."
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr "Niste ovlašteni da dodajete ili ažurirate unose prije {0}"
@@ -60818,7 +60961,7 @@ msgstr "Također možete postaviti standard Račun Kapitalnog Posla u Toku u tvr
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr "Možete promijeniti nadređeni račun u račun Bilansa Stanja ili odabrati drugi račun."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr "Ne možete unijeti trenutni verifikat u kolonu 'Naspram Naloga Knjiženja'"
@@ -60835,7 +60978,7 @@ msgstr "Ovim redom možete iskoristiti najviše {0} bodova."
msgid "You can only select one mode of payment as default"
msgstr "Možete odabrati samo jedan način plaćanja kao standard"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr "Možete iskoristiti do {0}."
@@ -60867,11 +61010,11 @@ msgstr "Ne možete kreirati {0} unutar zatvorenog Knjigovodstvenog Perioda {1}"
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr "Ne možete kreirati ili poništiti bilo koje knjigovodstvene unose u zatvorenom knjigovodstvenom periodu {0}"
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr "Ne možete kreirati/izmijeniti bilo koje knjigovodstvene unose do ovog datuma."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr "Ne možete kreditirati i debitiratii isti račun u isto vrijeme"
@@ -60887,7 +61030,7 @@ msgstr "Ne možete uređivati nadređeni član."
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr "Ne možete omogućiti i '{0}' i '{1} postavke."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr "Ne možete iskoristiti više od {0}."
@@ -60919,7 +61062,7 @@ msgstr "Nemate dozvole za {} artikala u {}."
msgid "You don't have enough Loyalty Points to redeem"
msgstr "Nemate dovoljno bodova lojalnosti da ih iskoristite"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr "Nemate dovoljno bodova da ih iskoristite."
@@ -61345,7 +61488,7 @@ msgstr "naziv"
msgid "to"
msgstr "do"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr "da poništite iznos ove povratne fakture prije nego što je poništite."
@@ -61385,7 +61528,7 @@ msgstr "{0}"
msgid "{0} '{1}' is disabled"
msgstr "{0} '{1}' je onemogućen"
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr "{0} '{1}' nije u Fiskalnoj Godini {2}"
@@ -61417,7 +61560,7 @@ msgstr "{0} Korišteni kupon je {1}. Dozvoljena količina je iskorištena"
msgid "{0} Digest"
msgstr "{0} Sažetak"
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr "{0} Broj {1} se već koristi u {2} {3}"
@@ -61433,7 +61576,7 @@ msgstr "{0} Zahtjev za {1}"
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr "{0} Zadržani Uzorak se zasniva na Šarži, provjeri Ima Broj Šarže da zadržite uzorak artikla"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr "{0} Transakcije su Usaglašene"
@@ -61449,19 +61592,19 @@ msgstr "{0} račun nije tipa {1}"
msgid "{0} account not found while submitting purchase receipt"
msgstr "{0} račun nije pronađen prilikom podnošenja Kupovnog Računa"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr "{0} naspram Fakture {1} od {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr "{0} naspram Kupovnog Naloga {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr "{0} naspram Prodajne Fakture {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr "{0} naspram Prodajnog Naloga {1}"
@@ -61469,7 +61612,7 @@ msgstr "{0} naspram Prodajnog Naloga {1}"
msgid "{0} already has a Parent Procedure {1}."
msgstr "{0} već ima nadređenu proceduru {1}."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr "{0} i {1}"
@@ -61528,7 +61671,7 @@ msgstr "{0} uneseno dvaput u PDV Artikla"
msgid "{0} entered twice {1} in Item Taxes"
msgstr "{0} uneseno dvaput {1} u PDV Artikla"
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr "{0} za {1}"
@@ -61581,7 +61724,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr "{0} je obavezan za artikal {1}"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr "{0} je obavezan za račun {1}"
@@ -61656,7 +61799,7 @@ msgstr "{0} proizvedenih artikala"
msgid "{0} must be negative in return document"
msgstr "{0} mora biti negativan u povratnom dokumentu"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr "{0} nije dozvoljeno obavljati transakcije sa {1}. Promijeni tvrtku ili dodaj tvrtku u sekciju 'Dozvoljena Transakcija s' u zapisu o klijentima."
@@ -61672,7 +61815,7 @@ msgstr "{0} parametar je nevažeći"
msgid "{0} payment entries can not be filtered by {1}"
msgstr "{0} unose plaćanja ne može filtrirati {1}"
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr "{0} količina artikla {1} se prima u Skladište {2} kapaciteta {3}."
@@ -61733,7 +61876,7 @@ msgstr "{0} {1}"
msgid "{0} {1} Manually"
msgstr "{0} {1} Ručno"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr "{0} {1} Djelimično Usaglašeno"
@@ -61798,7 +61941,7 @@ msgstr "{0} {1} je otkazan ili zaustavljen"
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr "{0} {1} je otkazan tako da se radnja ne može dovršiti"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr "{0} {1} je zatvoren"
@@ -61810,7 +61953,7 @@ msgstr "{0} {1} je onemogućen"
msgid "{0} {1} is frozen"
msgstr "{0} {1} je zamrznut"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr "{0} {1} je u potpunosti fakturisano"
@@ -61822,12 +61965,12 @@ msgstr "{0} {1} nije aktivan"
msgid "{0} {1} is not associated with {2} {3}"
msgstr "{0} {1} nije povezano sa {2} {3}"
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr "{0} {1} nije ni u jednoj aktivnoj Fiskalnoj Godini"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr "{0} {1} nije podnešen"
@@ -61839,7 +61982,7 @@ msgstr "{0} {1} je na čekanju"
msgid "{0} {1} must be submitted"
msgstr "{0} {1} mora se podnijeti"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr "{0} {1} nije dozvoljeno ponovno knjiženje. Izmijeni {2} da omogućite ponovno knjiženje."
@@ -61874,7 +62017,7 @@ msgstr "{0} {1}: Račun {2} je neaktivan"
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr "{0} {1}: Knjigovodstveni Unos za {2} može se izvršiti samo u valuti: {3}"
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr "{0} {1}: Centar Troškova je obavezan za Artikal {2}"
@@ -61952,7 +62095,7 @@ msgstr "{doctype} {name} je otkazan ili zatvoren."
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr "{field_label} je obavezan za podugovoren {doctype}."
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr "{item_name} Veličina Uzorka ({sample_size}) ne može biti veća od Prihvaćene Količina ({accepted_quantity})"
@@ -61960,7 +62103,7 @@ msgstr "{item_name} Veličina Uzorka ({sample_size}) ne može biti veća od Prih
msgid "{ref_doctype} {ref_name} is {status}."
msgstr "{ref_doctype} {ref_name} je {status}."
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr "{}"
@@ -62018,7 +62161,7 @@ msgstr "{} Na Čekanju"
msgid "{} To Bill"
msgstr "{} Za Fakturisati"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr "{} se ne može otkazati jer su zarađeni Poeni Lojalnosti iskorišteni. Prvo otkažite {} Broj {}"
diff --git a/erpnext/locale/hu.po b/erpnext/locale/hu.po
index 7b2664731a9..3445326cb34 100644
--- a/erpnext/locale/hu.po
+++ b/erpnext/locale/hu.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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:09\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:05\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Hungarian\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr ""
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr ""
msgid "'Default {0} Account' in Company {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr ""
@@ -840,11 +840,11 @@ msgstr ""
msgid "Your Shortcuts"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr ""
@@ -1215,10 +1215,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1523,7 +1523,7 @@ msgstr ""
msgid "Account {0}: You can not assign itself as parent account"
msgstr ""
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr ""
@@ -2012,7 +2012,7 @@ msgstr ""
msgid "Accounts Manager"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr ""
@@ -2199,7 +2199,7 @@ msgstr ""
msgid "Accounts User"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr ""
@@ -2559,6 +2559,10 @@ msgstr ""
msgid "Actual Expense"
msgstr ""
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr ""
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2696,7 +2700,7 @@ msgstr ""
msgid "Add Child"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr ""
@@ -3502,7 +3506,7 @@ msgstr ""
msgid "Advance amount cannot be greater than {0} {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr ""
@@ -3559,7 +3563,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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr ""
@@ -3628,7 +3632,7 @@ msgstr ""
msgid "Against Income Account"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr ""
@@ -3676,7 +3680,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr ""
@@ -3688,7 +3692,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr ""
@@ -3700,8 +3704,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr ""
@@ -3827,7 +3831,7 @@ msgstr ""
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr ""
@@ -3995,7 +3999,7 @@ msgstr ""
msgid "All items have already been Invoiced/Returned"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr ""
@@ -4021,7 +4025,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:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr ""
@@ -4907,7 +4911,7 @@ msgstr ""
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5047,7 +5051,7 @@ msgstr ""
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr ""
@@ -5198,7 +5202,7 @@ msgstr ""
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr ""
@@ -5781,7 +5785,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5823,7 +5827,7 @@ msgstr ""
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr ""
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr ""
@@ -5862,7 +5866,7 @@ msgstr ""
msgid "Asset Finance Book"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr ""
@@ -5938,7 +5942,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr ""
@@ -6024,9 +6028,9 @@ msgstr ""
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr ""
@@ -6055,7 +6059,7 @@ msgstr ""
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr ""
@@ -6087,7 +6091,7 @@ msgstr ""
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr ""
@@ -6099,11 +6103,11 @@ msgstr ""
msgid "Asset returned"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr ""
@@ -6128,7 +6132,7 @@ msgstr ""
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr ""
@@ -6161,7 +6165,15 @@ msgstr ""
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr ""
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr ""
@@ -6542,7 +6554,7 @@ msgstr ""
msgid "Auto Reconcile Payments"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr ""
@@ -6552,7 +6564,7 @@ msgstr ""
msgid "Auto Reconciliation Job Trigger"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr ""
@@ -6727,7 +6739,7 @@ msgstr ""
msgid "Available Batch Report"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr ""
@@ -6956,7 +6968,7 @@ msgstr ""
msgid "BOM 1"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr ""
@@ -7194,23 +7206,23 @@ msgstr ""
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr ""
@@ -7281,7 +7293,7 @@ msgstr ""
msgid "Balance (Dr - Cr)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr ""
@@ -7760,7 +7772,7 @@ msgstr ""
msgid "Base Tax Withholding Net Total"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr ""
@@ -7965,7 +7977,9 @@ msgstr ""
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -7976,7 +7990,7 @@ msgstr ""
msgid "Batch No is mandatory"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr ""
@@ -7999,7 +8013,7 @@ msgstr ""
msgid "Batch Nos"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr ""
@@ -8012,7 +8026,7 @@ msgstr ""
msgid "Batch Number Series"
msgstr ""
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr ""
@@ -8125,7 +8139,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8438,8 +8452,8 @@ msgstr ""
msgid "Blanket Order Rate"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr ""
@@ -8555,7 +8569,7 @@ msgstr ""
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr ""
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr ""
@@ -9329,7 +9343,7 @@ msgstr ""
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr ""
@@ -9515,7 +9529,7 @@ msgstr ""
msgid "Cannot Relieve Employee"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr ""
@@ -9531,6 +9545,10 @@ msgstr ""
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr ""
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr ""
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr ""
@@ -9620,7 +9638,7 @@ msgstr ""
msgid "Cannot create root account."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr ""
@@ -9637,7 +9655,7 @@ msgstr ""
msgid "Cannot delete Exchange Gain/Loss row"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr ""
@@ -10083,11 +10101,11 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr ""
@@ -10100,7 +10118,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr ""
@@ -10908,6 +10926,7 @@ msgstr ""
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11055,6 +11074,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11140,8 +11160,8 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11457,7 +11477,7 @@ msgstr ""
msgid "Company and Posting Date is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr ""
@@ -12738,7 +12758,7 @@ 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12757,7 +12777,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -12970,7 +12990,7 @@ msgstr ""
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr ""
@@ -13093,15 +13113,15 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13343,7 +13363,7 @@ msgstr ""
msgid "Create POS Opening Entry"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr ""
@@ -13499,7 +13519,7 @@ msgstr ""
msgid "Creating Delivery Note ..."
msgstr ""
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr ""
@@ -13519,7 +13539,7 @@ msgstr ""
msgid "Creating Purchase Order ..."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13556,11 +13576,6 @@ msgstr ""
msgid "Creation"
msgstr ""
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr ""
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr ""
@@ -13593,11 +13608,11 @@ msgstr ""
msgid "Credit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr ""
@@ -13740,7 +13755,7 @@ 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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr ""
@@ -13948,7 +13963,7 @@ msgstr ""
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14047,7 +14062,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr ""
@@ -14397,6 +14412,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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14424,6 +14440,10 @@ msgstr ""
msgid "Customer / Lead Address"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr ""
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14825,7 +14845,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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr ""
@@ -15177,7 +15197,7 @@ msgstr ""
msgid "Date of Joining"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr ""
@@ -15314,11 +15334,11 @@ msgstr ""
msgid "Debit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr ""
@@ -15392,7 +15412,7 @@ msgstr ""
msgid "Debit To is required"
msgstr ""
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr ""
@@ -16459,7 +16479,7 @@ msgstr ""
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16534,9 +16554,9 @@ msgstr ""
msgid "Depreciate based on shifts"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr ""
@@ -16592,6 +16612,14 @@ msgstr ""
msgid "Depreciation Entry Posting Status"
msgstr ""
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr ""
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16600,7 +16628,7 @@ msgstr ""
msgid "Depreciation Expense Account"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr ""
@@ -17486,6 +17514,10 @@ msgstr ""
msgid "Discount Percentage"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr ""
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr ""
@@ -17718,7 +17750,7 @@ msgstr ""
msgid "Disposal Date"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr ""
@@ -17998,7 +18030,7 @@ msgstr ""
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr ""
@@ -19037,7 +19069,7 @@ msgstr ""
msgid "Ems(Pica)"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr ""
@@ -19388,7 +19420,7 @@ msgstr ""
msgid "Enter a name for this Holiday List."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr ""
@@ -19449,7 +19481,7 @@ msgstr ""
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr ""
@@ -19469,7 +19501,7 @@ msgid "Entity"
msgstr ""
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19564,7 +19596,7 @@ msgstr ""
msgid "Error in party matching for Bank Transaction {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr ""
@@ -19614,10 +19646,8 @@ msgstr ""
msgid "Evaluation Period"
msgstr ""
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
msgstr ""
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
@@ -19979,7 +20009,7 @@ msgstr ""
msgid "Expense"
msgstr ""
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr ""
@@ -20024,7 +20054,7 @@ msgstr ""
msgid "Expense Account"
msgstr ""
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr ""
@@ -20331,7 +20361,7 @@ msgstr ""
msgid "Failure Description"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr ""
@@ -21007,6 +21037,10 @@ msgstr ""
msgid "Fixed Asset Register"
msgstr ""
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21137,7 +21171,7 @@ msgstr ""
msgid "For Item"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr ""
@@ -22029,7 +22063,7 @@ msgstr ""
msgid "Future Payments"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr ""
@@ -22045,7 +22079,7 @@ msgstr ""
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr ""
@@ -22311,8 +22345,8 @@ msgid "Get Items"
msgstr ""
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22671,7 +22705,7 @@ msgstr ""
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22681,7 +22715,7 @@ msgstr ""
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22802,8 +22836,8 @@ msgstr ""
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr ""
@@ -23154,7 +23188,7 @@ msgstr ""
msgid "Height (cm)"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr ""
@@ -23193,7 +23227,7 @@ msgstr ""
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr ""
@@ -23289,7 +23323,7 @@ msgstr ""
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr ""
@@ -23383,6 +23417,10 @@ msgstr ""
msgid "Hours Spent"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr ""
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23719,6 +23757,10 @@ msgstr ""
msgid "If more than one package of the same type (for print)"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr ""
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23735,6 +23777,10 @@ msgstr ""
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr ""
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23817,6 +23863,10 @@ msgstr ""
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr ""
@@ -23911,7 +23961,7 @@ msgstr ""
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -23963,7 +24013,7 @@ msgstr ""
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr ""
@@ -24726,7 +24776,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24799,7 +24849,7 @@ msgstr ""
msgid "Incorrect Stock Value Report"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr ""
@@ -24966,13 +25016,13 @@ msgstr ""
msgid "Inspected By"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr ""
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr ""
@@ -24989,7 +25039,7 @@ msgstr ""
msgid "Inspection Required before Purchase"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr ""
@@ -25019,7 +25069,7 @@ msgstr ""
msgid "Installation Note Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr ""
@@ -25077,7 +25127,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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr ""
@@ -25268,7 +25318,7 @@ msgstr ""
msgid "Internal Work History"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr ""
@@ -25304,7 +25354,7 @@ msgid "Invalid Account"
msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr ""
@@ -25332,7 +25382,7 @@ msgstr ""
msgid "Invalid Child Procedure"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr ""
@@ -25390,7 +25440,7 @@ msgid "Invalid Ledger Entries"
msgstr ""
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr ""
@@ -25418,7 +25468,7 @@ msgstr ""
msgid "Invalid Priority"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr ""
@@ -25502,8 +25552,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr ""
@@ -25511,7 +25561,7 @@ msgstr ""
msgid "Invalid {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr ""
@@ -25721,7 +25771,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26773,6 +26823,8 @@ msgstr ""
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26791,7 +26843,11 @@ msgstr ""
msgid "Item Code (Final Product)"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr ""
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr ""
@@ -27195,6 +27251,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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28115,7 +28172,7 @@ msgstr ""
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr ""
@@ -28321,7 +28378,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29037,7 +29094,7 @@ msgstr ""
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29708,7 +29765,7 @@ msgstr ""
msgid "Mandatory Depends On"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr ""
@@ -29798,6 +29855,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30356,6 +30414,7 @@ msgid "Material Requested"
msgstr ""
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr ""
@@ -30711,7 +30770,7 @@ msgstr ""
msgid "Message Examples"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr ""
@@ -31025,8 +31084,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr ""
@@ -31044,6 +31103,10 @@ msgstr ""
msgid "Missing Default in Company"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr ""
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr ""
@@ -31076,7 +31139,7 @@ msgstr ""
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr ""
@@ -31742,7 +31805,7 @@ msgstr ""
msgid "Needs Analysis"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr ""
@@ -32174,7 +32237,7 @@ msgstr ""
msgid "New Sales Person Name"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr ""
@@ -32210,7 +32273,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:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr ""
@@ -32319,7 +32382,7 @@ msgstr ""
msgid "No Answer"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr ""
@@ -32376,9 +32439,9 @@ msgstr ""
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr ""
@@ -32413,7 +32476,7 @@ msgstr ""
msgid "No Summary"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr ""
@@ -32511,7 +32574,7 @@ msgstr ""
msgid "No items to be received are overdue"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr ""
@@ -32645,11 +32708,11 @@ msgstr ""
msgid "No values"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr ""
@@ -32684,7 +32747,7 @@ msgstr ""
msgid "Non Profit"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr ""
@@ -32863,7 +32926,7 @@ msgstr ""
msgid "Note: Email will not be sent to disabled users"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr ""
@@ -32883,7 +32946,7 @@ msgstr ""
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr ""
@@ -32899,6 +32962,7 @@ msgstr ""
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33334,6 +33398,12 @@ msgstr ""
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr ""
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr ""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33535,8 +33605,8 @@ msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr ""
@@ -33578,7 +33648,7 @@ msgstr ""
msgid "Opening Entry"
msgstr ""
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr ""
@@ -33606,7 +33676,7 @@ msgid "Opening Invoice Item"
msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 ""
@@ -33680,7 +33750,7 @@ msgstr ""
msgid "Operating Cost Per BOM Quantity"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr ""
@@ -33836,7 +33906,7 @@ msgstr ""
msgid "Operations Routing"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr ""
@@ -34428,7 +34498,7 @@ msgstr ""
msgid "Over Picking Allowance"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr ""
@@ -34880,7 +34950,7 @@ msgstr ""
msgid "Packed Items"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr ""
@@ -34915,7 +34985,7 @@ msgstr ""
msgid "Packing Slip Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr ""
@@ -35001,7 +35071,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35276,7 +35346,7 @@ msgstr ""
msgid "Partial Payment in POS Transactions are not allowed."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr ""
@@ -35470,9 +35540,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35633,9 +35703,9 @@ 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35800,7 +35870,7 @@ msgstr ""
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -35936,7 +36006,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr ""
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr ""
@@ -36145,7 +36215,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36171,11 +36241,11 @@ msgstr ""
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr ""
@@ -36333,7 +36403,7 @@ msgstr ""
msgid "Payment Unlink Error"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr ""
@@ -36654,7 +36724,7 @@ msgstr ""
msgid "Period Based On"
msgstr ""
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr ""
@@ -37257,7 +37327,7 @@ msgstr ""
msgid "Please add {1} role to user {0}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr ""
@@ -37265,7 +37335,7 @@ msgstr ""
msgid "Please attach CSV file"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr ""
@@ -37278,7 +37348,7 @@ msgstr ""
msgid "Please cancel related transaction."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr ""
@@ -37355,7 +37425,7 @@ msgstr ""
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr ""
@@ -37479,7 +37549,7 @@ msgstr ""
msgid "Please enter Receipt Document"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr ""
@@ -37604,8 +37674,8 @@ msgstr ""
msgid "Please mention 'Weight UOM' along with Weight."
msgstr ""
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr ""
@@ -37733,7 +37803,7 @@ msgstr ""
msgid "Please select Posting Date first"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr ""
@@ -37765,7 +37835,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr ""
@@ -37855,6 +37925,10 @@ 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
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr ""
@@ -37863,7 +37937,7 @@ msgstr ""
msgid "Please select atleast one operation to create Job Card"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr ""
@@ -37944,15 +38018,15 @@ msgstr ""
msgid "Please set 'Apply Additional Discount On'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr ""
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr ""
@@ -37960,7 +38034,7 @@ msgstr ""
msgid "Please set Account"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr ""
@@ -37986,7 +38060,7 @@ msgstr ""
msgid "Please set Company"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr ""
@@ -38004,7 +38078,7 @@ msgstr ""
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr ""
@@ -38067,7 +38141,7 @@ msgstr ""
msgid "Please set an Address on the Company '%s'"
msgstr ""
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr ""
@@ -38083,23 +38157,23 @@ msgstr ""
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr ""
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr ""
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr ""
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr ""
@@ -38203,7 +38277,7 @@ msgstr ""
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr ""
@@ -38216,7 +38290,7 @@ msgid "Please specify Company"
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr ""
@@ -38389,6 +38463,7 @@ msgstr ""
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38423,11 +38498,11 @@ 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38446,6 +38521,7 @@ msgstr ""
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38455,6 +38531,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_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
@@ -39020,6 +39097,14 @@ msgstr ""
msgid "Pricing Rule Item Group"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr ""
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr ""
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr ""
@@ -39078,6 +39163,10 @@ msgstr ""
msgid "Pricing Rules"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr ""
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39465,7 +39554,7 @@ msgstr ""
msgid "Process Loss"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr ""
@@ -39955,7 +40044,7 @@ msgstr ""
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40430,7 +40519,7 @@ msgstr ""
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr ""
@@ -40586,7 +40675,7 @@ msgstr ""
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40762,9 +40851,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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41645,6 +41734,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/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
@@ -41761,7 +41851,7 @@ msgstr ""
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr ""
@@ -42610,7 +42700,7 @@ msgid "Reason"
msgstr ""
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr ""
@@ -43046,7 +43136,7 @@ msgstr ""
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr ""
@@ -43178,7 +43268,7 @@ msgstr ""
msgid "Reference"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr ""
@@ -43316,7 +43406,7 @@ msgstr ""
msgid "Reference No"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr ""
@@ -43324,11 +43414,11 @@ msgstr ""
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr ""
@@ -43442,11 +43532,11 @@ msgstr ""
msgid "References"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr ""
@@ -43591,8 +43681,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43611,7 +43701,7 @@ msgstr ""
msgid "Remaining"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr ""
@@ -43624,7 +43714,7 @@ msgstr ""
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr ""
@@ -43673,7 +43763,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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -43984,7 +44074,7 @@ msgstr ""
msgid "Repost Status"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr ""
@@ -44308,7 +44398,7 @@ msgstr ""
msgid "Reseller"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr ""
@@ -44777,7 +44867,7 @@ msgstr ""
msgid "Return / Credit Note"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr ""
@@ -45301,12 +45391,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: 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/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr ""
@@ -45452,7 +45542,7 @@ msgstr ""
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr ""
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr ""
@@ -45476,11 +45566,11 @@ msgstr ""
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr ""
@@ -45500,7 +45590,7 @@ msgstr ""
msgid "Row #{0}: Item {1} does not exist"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr ""
@@ -45536,7 +45626,7 @@ 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:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr ""
@@ -45581,15 +45671,15 @@ msgstr ""
msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr ""
@@ -45598,7 +45688,7 @@ msgstr ""
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr ""
@@ -45692,19 +45782,19 @@ msgstr ""
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr ""
@@ -45712,8 +45802,8 @@ msgstr ""
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr ""
@@ -45894,7 +45984,7 @@ msgstr ""
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr ""
@@ -45902,11 +45992,11 @@ msgstr ""
msgid "Row {0}: Activity Type is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr ""
@@ -45926,7 +46016,7 @@ msgstr ""
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr ""
@@ -45942,7 +46032,7 @@ msgstr ""
msgid "Row {0}: Cost center is required for an item {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr ""
@@ -45950,7 +46040,7 @@ msgstr ""
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr ""
@@ -45966,7 +46056,7 @@ msgstr ""
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr ""
@@ -46000,7 +46090,7 @@ msgstr ""
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46012,7 +46102,7 @@ msgstr ""
msgid "Row {0}: Hours value must be greater than zero."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr ""
@@ -46036,7 +46126,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr ""
@@ -46044,7 +46134,7 @@ msgstr ""
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr ""
@@ -46056,11 +46146,11 @@ msgstr ""
msgid "Row {0}: Payment Term is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr ""
@@ -46128,7 +46218,7 @@ msgstr ""
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46152,7 +46242,7 @@ msgstr ""
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr ""
@@ -46173,7 +46263,7 @@ msgstr ""
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr ""
@@ -46566,7 +46656,7 @@ msgstr ""
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr ""
@@ -46795,7 +46885,7 @@ msgstr ""
msgid "Sales Order Trends"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr ""
@@ -47305,8 +47395,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47577,7 +47667,7 @@ msgstr ""
msgid "Scrap Warehouse"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr ""
@@ -47650,7 +47740,7 @@ msgstr ""
msgid "Section"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr ""
@@ -48020,7 +48110,7 @@ msgstr ""
msgid "Selected POS Opening Entry should be open."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr ""
@@ -48204,7 +48294,7 @@ msgstr ""
msgid "Sender"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr ""
@@ -48328,7 +48418,9 @@ msgstr ""
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48359,7 +48451,9 @@ msgid "Serial No Count"
msgstr ""
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr ""
@@ -48367,7 +48461,7 @@ msgstr ""
msgid "Serial No Range"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr ""
@@ -48407,6 +48501,13 @@ msgstr ""
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr ""
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr ""
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr ""
@@ -48436,7 +48537,7 @@ msgstr ""
msgid "Serial No {0} does not exist"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr ""
@@ -48485,7 +48586,7 @@ msgstr ""
msgid "Serial Nos and Batches"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr ""
@@ -48563,11 +48664,11 @@ msgstr ""
msgid "Serial and Batch Bundle"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr ""
@@ -49001,7 +49102,7 @@ msgstr ""
msgid "Set Loyalty Program"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr ""
@@ -49256,7 +49357,7 @@ msgstr ""
msgid "Setting up company"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49440,7 +49541,7 @@ msgstr ""
msgid "Shipment details"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr ""
@@ -49687,6 +49788,10 @@ msgstr ""
msgid "Show Completed"
msgstr ""
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr ""
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr ""
@@ -49802,7 +49907,7 @@ msgstr ""
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr ""
@@ -50107,13 +50212,27 @@ msgstr ""
msgid "Source DocType"
msgstr ""
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr ""
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr ""
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr ""
@@ -50184,7 +50303,7 @@ msgstr ""
msgid "Source Warehouse Address Link"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr ""
@@ -50695,7 +50814,7 @@ msgstr ""
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51038,7 +51157,7 @@ msgstr ""
msgid "Stock Entry {0} has created"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr ""
@@ -51261,13 +51380,13 @@ msgstr ""
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51276,13 +51395,13 @@ msgstr ""
msgid "Stock Reservation"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr ""
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr ""
@@ -51304,7 +51423,7 @@ msgstr ""
msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr ""
@@ -51549,7 +51668,7 @@ msgstr ""
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr ""
@@ -51565,7 +51684,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr ""
@@ -52433,10 +52552,15 @@ 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr ""
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52549,7 +52673,7 @@ msgstr ""
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr ""
@@ -52563,8 +52687,8 @@ 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr ""
@@ -53111,16 +53235,16 @@ msgstr ""
msgid "System will notify to increase or decrease quantity or amount "
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr ""
@@ -53137,7 +53261,7 @@ msgstr ""
msgid "TDS Payable"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr ""
@@ -53693,7 +53817,7 @@ msgstr ""
msgid "Tax Withheld Vouchers"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr ""
@@ -54318,7 +54442,7 @@ msgstr ""
msgid "The BOM which will be replaced"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr ""
@@ -54346,7 +54470,7 @@ msgstr ""
msgid "The Loyalty Program isn't valid for the selected company"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr ""
@@ -54370,7 +54494,7 @@ msgstr ""
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr ""
@@ -54392,7 +54516,7 @@ msgstr ""
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr ""
@@ -54433,7 +54557,7 @@ msgstr ""
msgid "The field To Shareholder cannot be blank"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr ""
@@ -54449,7 +54573,7 @@ msgstr ""
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr ""
@@ -54710,6 +54834,10 @@ msgstr ""
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr ""
@@ -54976,7 +55104,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr ""
@@ -54984,7 +55112,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr ""
@@ -55759,6 +55887,10 @@ msgstr ""
msgid "To merge, following properties must be same for both items"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr ""
@@ -55776,7 +55908,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr ""
@@ -55998,7 +56130,7 @@ msgstr ""
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56160,7 +56292,7 @@ msgstr ""
msgid "Total Debit"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr ""
@@ -56753,6 +56885,10 @@ msgstr ""
msgid "Traceability"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr ""
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56793,7 +56929,7 @@ msgstr ""
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -56891,7 +57027,7 @@ msgstr ""
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr ""
@@ -56913,7 +57049,7 @@ msgstr ""
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57510,7 +57646,11 @@ msgstr ""
msgid "Unassigned Qty"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr ""
@@ -58877,7 +59017,7 @@ msgstr ""
msgid "Vendor Invoices"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr ""
@@ -58944,7 +59084,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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59135,11 +59275,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59174,7 +59314,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr ""
@@ -59206,9 +59346,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59227,6 +59367,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_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
@@ -59436,6 +59577,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_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
@@ -59544,7 +59686,7 @@ msgstr ""
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr ""
@@ -59557,7 +59699,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:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr ""
@@ -59708,7 +59850,7 @@ msgstr ""
msgid "Warning!"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr ""
@@ -60191,6 +60333,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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr ""
@@ -60666,7 +60809,7 @@ msgstr ""
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr ""
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr ""
@@ -60698,7 +60841,7 @@ msgstr ""
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr ""
@@ -60715,7 +60858,7 @@ msgstr ""
msgid "You can only select one mode of payment as default"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr ""
@@ -60747,11 +60890,11 @@ msgstr ""
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr ""
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr ""
@@ -60767,7 +60910,7 @@ msgstr ""
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr ""
@@ -60799,7 +60942,7 @@ msgstr ""
msgid "You don't have enough Loyalty Points to redeem"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr ""
@@ -61225,7 +61368,7 @@ msgstr ""
msgid "to"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr ""
@@ -61265,7 +61408,7 @@ msgstr ""
msgid "{0} '{1}' is disabled"
msgstr ""
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr ""
@@ -61297,7 +61440,7 @@ msgstr ""
msgid "{0} Digest"
msgstr ""
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr ""
@@ -61313,7 +61456,7 @@ msgstr ""
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr ""
@@ -61329,19 +61472,19 @@ msgstr ""
msgid "{0} account not found while submitting purchase receipt"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr ""
@@ -61349,7 +61492,7 @@ msgstr ""
msgid "{0} already has a Parent Procedure {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr ""
@@ -61408,7 +61551,7 @@ msgstr ""
msgid "{0} entered twice {1} in Item Taxes"
msgstr ""
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr ""
@@ -61461,7 +61604,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr ""
@@ -61536,7 +61679,7 @@ msgstr ""
msgid "{0} must be negative in return document"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr ""
@@ -61552,7 +61695,7 @@ msgstr ""
msgid "{0} payment entries can not be filtered by {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr ""
@@ -61613,7 +61756,7 @@ msgstr ""
msgid "{0} {1} Manually"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr ""
@@ -61678,7 +61821,7 @@ msgstr ""
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr ""
@@ -61690,7 +61833,7 @@ msgstr ""
msgid "{0} {1} is frozen"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr ""
@@ -61702,12 +61845,12 @@ msgstr ""
msgid "{0} {1} is not associated with {2} {3}"
msgstr ""
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr ""
@@ -61719,7 +61862,7 @@ msgstr ""
msgid "{0} {1} must be submitted"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr ""
@@ -61754,7 +61897,7 @@ msgstr ""
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr ""
@@ -61832,7 +61975,7 @@ msgstr "{doctype} {name} törlik vagy zárva."
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr ""
@@ -61840,7 +61983,7 @@ msgstr ""
msgid "{ref_doctype} {ref_name} is {status}."
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr ""
@@ -61898,7 +62041,7 @@ msgstr ""
msgid "{} To Bill"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr ""
diff --git a/erpnext/locale/id.po b/erpnext/locale/id.po
index 80520a0df30..d4544b38772 100644
--- a/erpnext/locale/id.po
+++ b/erpnext/locale/id.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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:10\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:06\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Indonesian\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr " Item"
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr "'Hari Sejak Pesanan Terakhir' harus lebih besar dari atau sama dengan no
msgid "'Default {0} Account' in Company {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr "'Entri' tidak boleh kosong"
@@ -840,11 +840,11 @@ msgstr ""
msgid "Your Shortcuts"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr ""
@@ -1215,10 +1215,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1523,7 +1523,7 @@ msgstr "Akun {0}: Akun induk {1} tidak ada"
msgid "Account {0}: You can not assign itself as parent account"
msgstr "Akun {0}: Anda tidak dapat menetapkannya sebagai Akun Induk"
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr "Akun: {0} adalah Aset Dalam Pengerjaan dan tidak dapat diperbarui oleh Entri Jurnal"
@@ -2012,7 +2012,7 @@ msgstr ""
msgid "Accounts Manager"
msgstr "Manajer Akun"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr ""
@@ -2199,7 +2199,7 @@ msgstr "Pengaturan Akun"
msgid "Accounts User"
msgstr "Pengguna Akun"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr "Tabel Akun tidak boleh kosong."
@@ -2559,6 +2559,10 @@ msgstr ""
msgid "Actual Expense"
msgstr ""
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr ""
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2696,7 +2700,7 @@ msgstr "Tambah / Edit Harga"
msgid "Add Child"
msgstr "Tambah Sub-Akun"
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr ""
@@ -3502,7 +3506,7 @@ msgstr ""
msgid "Advance amount cannot be greater than {0} {1}"
msgstr "Jumlah uang muka tidak boleh lebih besar dari {0} {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr ""
@@ -3559,7 +3563,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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr "Akun Lawan"
@@ -3628,7 +3632,7 @@ msgstr ""
msgid "Against Income Account"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr "Entri Jurnal Lawan {0} tidak memiliki entri {1} yang belum dicocokkan"
@@ -3676,7 +3680,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr "Voucher Lawan"
@@ -3688,7 +3692,7 @@ msgstr "Voucher Lawan"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr ""
@@ -3700,8 +3704,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr "Tipe Voucher Lawan"
@@ -3827,7 +3831,7 @@ msgstr "Semua"
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr "Semua Akun"
@@ -3995,7 +3999,7 @@ msgstr ""
msgid "All items have already been Invoiced/Returned"
msgstr "Semua item sudah Ditagih/Dikembalikan"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr ""
@@ -4021,7 +4025,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:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr "Semua item ini telah Ditagih/Dikembalikan"
@@ -4907,7 +4911,7 @@ msgstr ""
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5047,7 +5051,7 @@ msgstr ""
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr ""
@@ -5198,7 +5202,7 @@ msgstr "Catatan Anggaran lain '{0}' sudah ada terhadap {1} '{2}' dan akun '{3}'
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr ""
@@ -5781,7 +5785,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5823,7 +5827,7 @@ msgstr ""
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr ""
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr ""
@@ -5862,7 +5866,7 @@ msgstr ""
msgid "Asset Finance Book"
msgstr "Buku Keuangan Aset"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr ""
@@ -5938,7 +5942,7 @@ msgstr "Catatan Pergerakan Aset {0} dibuat"
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr "Nama Aset"
@@ -6024,9 +6028,9 @@ msgstr ""
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr "Nilai Aset"
@@ -6055,7 +6059,7 @@ msgstr ""
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "Aset tidak dapat dibatalkan, karena sudah {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr ""
@@ -6087,7 +6091,7 @@ msgstr ""
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr ""
@@ -6099,11 +6103,11 @@ msgstr ""
msgid "Asset returned"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr "Aset dihapusbukukan melalui Entri Jurnal {0}"
@@ -6128,7 +6132,7 @@ msgstr ""
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr "Aset {0} tidak dapat dihapusbukukan, karena sudah {1}"
@@ -6161,7 +6165,15 @@ msgstr ""
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr ""
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr "Aset {0} harus disubmit"
@@ -6542,7 +6554,7 @@ msgstr ""
msgid "Auto Reconcile Payments"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr ""
@@ -6552,7 +6564,7 @@ msgstr ""
msgid "Auto Reconciliation Job Trigger"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr ""
@@ -6727,7 +6739,7 @@ msgstr ""
msgid "Available Batch Report"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr "Tanggal Siap Digunakan"
@@ -6956,7 +6968,7 @@ msgstr ""
msgid "BOM 1"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "BOM 1 {0} dan BOM 2 {1} tidak boleh sama"
@@ -7194,23 +7206,23 @@ msgstr "BOM tidak berisi item stok apa pun"
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr "Rekursi BOM: {0} tidak boleh sub dari {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr "BOM {0} harus aktif"
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr "BOM {0} harus disubmit"
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr ""
@@ -7281,7 +7293,7 @@ msgstr "Saldo"
msgid "Balance (Dr - Cr)"
msgstr "Saldo (Dr - Cr)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr "Saldo ({0})"
@@ -7760,7 +7772,7 @@ msgstr ""
msgid "Base Tax Withholding Net Total"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr ""
@@ -7965,7 +7977,9 @@ msgstr "Status Kadaluarsa Item Batch"
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -7976,7 +7990,7 @@ msgstr "No. Batch"
msgid "Batch No is mandatory"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr ""
@@ -7999,7 +8013,7 @@ msgstr ""
msgid "Batch Nos"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr ""
@@ -8012,7 +8026,7 @@ msgstr ""
msgid "Batch Number Series"
msgstr ""
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr ""
@@ -8125,7 +8139,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8438,8 +8452,8 @@ msgstr ""
msgid "Blanket Order Rate"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr "Blokir Faktur"
@@ -8555,7 +8569,7 @@ msgstr ""
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr ""
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr ""
@@ -9329,7 +9343,7 @@ msgstr "Tidak dapat memfilter berdasarkan Metode Pembayaran, jika dikelompokkan
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr "Tidak dapat memfilter berdasarkan No. Voucher, jika dikelompokkan berdasarkan Voucher"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr "Hanya dapat melakukan pembayaran terhadap {0} yang belum ditagih"
@@ -9515,7 +9529,7 @@ msgstr "Tidak Dapat Mengoptimalkan Rute karena Alamat Pengemudi Tidak Ada."
msgid "Cannot Relieve Employee"
msgstr "Tidak Dapat Memberhentikan Karyawan"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr ""
@@ -9531,6 +9545,10 @@ msgstr ""
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr "Tidak dapat menjadi item aset tetap karena Buku Besar Persediaan telah dibuat."
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr ""
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr ""
@@ -9620,7 +9638,7 @@ msgstr ""
msgid "Cannot create root account."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr "Tidak bisa menonaktifkan atau membatalkan BOM seperti yang terkait dengan BOMs lainnya"
@@ -9637,7 +9655,7 @@ msgstr "Tidak bisa mengurangi ketika kategori adalah untuk 'Penilaian' atau 'Pen
msgid "Cannot delete Exchange Gain/Loss row"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr "Tidak dapat menghapus No. Seri {0}, karena digunakan dalam transaksi persediaan"
@@ -10083,11 +10101,11 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr "Ubah Tanggal Rilis"
@@ -10100,7 +10118,7 @@ msgstr "Ubah Tanggal Rilis"
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr ""
@@ -10908,6 +10926,7 @@ msgstr ""
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11055,6 +11074,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11140,8 +11160,8 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11457,7 +11477,7 @@ msgstr ""
msgid "Company and Posting Date is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr "Mata uang perusahaan dari kedua perusahaan harus sesuai untuk Transaksi Antar Perusahaan."
@@ -12738,7 +12758,7 @@ 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12757,7 +12777,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -12970,7 +12990,7 @@ msgstr ""
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr "Tidak dapat membuat Pelanggan secara otomatis karena bidang wajib berikut kosong:"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr "Tidak dapat membuat Nota Kredit secara otomatis, harap batalkan centang 'Terbitkan Nota Kredit' dan kirim ulang"
@@ -13093,15 +13113,15 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13343,7 +13363,7 @@ msgstr ""
msgid "Create POS Opening Entry"
msgstr "Buat Entri Pembukaan POS"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr "Buat Entri Pembayaran"
@@ -13499,7 +13519,7 @@ msgstr "Membuat Akun ..."
msgid "Creating Delivery Note ..."
msgstr ""
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr "Membuat Dimensi..."
@@ -13519,7 +13539,7 @@ msgstr ""
msgid "Creating Purchase Order ..."
msgstr "Membuat Pesanan Pembelian ..."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13556,11 +13576,6 @@ msgstr "Membuat {} dari {} {}"
msgid "Creation"
msgstr ""
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr ""
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr ""
@@ -13593,11 +13608,11 @@ msgstr ""
msgid "Credit"
msgstr "Kredit"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr "Kredit ({0})"
@@ -13740,7 +13755,7 @@ msgstr "Nota Kredit Diterbitkan"
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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr "Nota Kredit {0} telah dibuat secara otomatis"
@@ -13948,7 +13963,7 @@ msgstr ""
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14047,7 +14062,7 @@ msgstr "Mata Uang tidak dapat diubah setelah membuat entri menggunakan mata uang
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr "Mata Uang untuk {0} harus {1}"
@@ -14397,6 +14412,7 @@ msgstr "Kustom?"
#: 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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14424,6 +14440,10 @@ msgstr ""
msgid "Customer / Lead Address"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr ""
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14825,7 +14845,7 @@ msgstr "Pelanggan diperlukan untuk 'Diskon Berdasarkan Pelanggan'"
#: 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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr "Pelanggan {0} bukan bagian dari proyek {1}"
@@ -15177,7 +15197,7 @@ msgstr ""
msgid "Date of Joining"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr "Tanggal Transaksi"
@@ -15314,11 +15334,11 @@ msgstr "Yth. Manajer Sistem,"
msgid "Debit"
msgstr "Debet"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr ""
@@ -15392,7 +15412,7 @@ msgstr ""
msgid "Debit To is required"
msgstr "Debit Ke wajib diisi"
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr "Debit dan Kredit tidak sama untuk {0} #{1}. Selisihnya adalah {2}."
@@ -16459,7 +16479,7 @@ msgstr ""
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16534,9 +16554,9 @@ msgstr ""
msgid "Depreciate based on shifts"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr "Jumlah yang Disusutkan"
@@ -16592,6 +16612,14 @@ msgstr "penyusutan Masuk"
msgid "Depreciation Entry Posting Status"
msgstr ""
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr ""
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16600,7 +16628,7 @@ msgstr ""
msgid "Depreciation Expense Account"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr ""
@@ -17486,6 +17514,10 @@ msgstr ""
msgid "Discount Percentage"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr ""
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr ""
@@ -17718,7 +17750,7 @@ msgstr ""
msgid "Disposal Date"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr ""
@@ -17998,7 +18030,7 @@ msgstr ""
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr ""
@@ -19037,7 +19069,7 @@ msgstr "Kosong"
msgid "Ems(Pica)"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr ""
@@ -19388,7 +19420,7 @@ msgstr ""
msgid "Enter a name for this Holiday List."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr "Masukkan jumlah yang akan ditukarkan."
@@ -19449,7 +19481,7 @@ msgstr ""
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr "Masukkan jumlah {0}."
@@ -19469,7 +19501,7 @@ msgid "Entity"
msgstr ""
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19564,7 +19596,7 @@ msgstr "Kesalahan mengevaluasi formula kriteria"
msgid "Error in party matching for Bank Transaction {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr ""
@@ -19614,10 +19646,8 @@ msgstr ""
msgid "Evaluation Period"
msgstr ""
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
msgstr ""
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
@@ -19979,7 +20009,7 @@ msgstr ""
msgid "Expense"
msgstr "Biaya"
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr "Beban akun / Difference ({0}) harus akun 'Laba atau Rugi'"
@@ -20024,7 +20054,7 @@ msgstr "Beban akun / Difference ({0}) harus akun 'Laba atau Rugi'"
msgid "Expense Account"
msgstr "Beban Akun"
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr "Akun Beban Hilang"
@@ -20331,7 +20361,7 @@ msgstr ""
msgid "Failure Description"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr ""
@@ -21007,6 +21037,10 @@ msgstr "Fixed Asset Item harus barang non-persediaan."
msgid "Fixed Asset Register"
msgstr "Daftar Aset Tetap"
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21137,7 +21171,7 @@ msgstr "Untuk Pemasok Default (Opsional)"
msgid "For Item"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr ""
@@ -22029,7 +22063,7 @@ msgstr "Ref Pembayaran di Masa Depan"
msgid "Future Payments"
msgstr "Pembayaran di masa depan"
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr ""
@@ -22045,7 +22079,7 @@ msgstr ""
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr "GL Entri"
@@ -22311,8 +22345,8 @@ msgid "Get Items"
msgstr "Dapatkan Produk"
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22671,7 +22705,7 @@ msgstr ""
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22681,7 +22715,7 @@ msgstr ""
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22802,8 +22836,8 @@ msgstr ""
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr "Jumlah Pembelian Gross"
@@ -23154,7 +23188,7 @@ msgstr ""
msgid "Height (cm)"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr ""
@@ -23193,7 +23227,7 @@ msgstr ""
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr ""
@@ -23289,7 +23323,7 @@ msgstr "Ditahan"
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr "Tahan Faktur"
@@ -23383,6 +23417,10 @@ msgstr "Jam"
msgid "Hours Spent"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr ""
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23719,6 +23757,10 @@ msgstr ""
msgid "If more than one package of the same type (for print)"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr ""
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23735,6 +23777,10 @@ msgstr ""
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr ""
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23817,6 +23863,10 @@ msgstr "Jika dicentang, beberapa bahan dapat digunakan untuk satu Perintah Kerja
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr "Jika dicentang, biaya BOM akan otomatis terupdate berdasarkan Harga Penilaian / Harga Daftar Harga / harga pembelian terakhir bahan baku."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr ""
@@ -23911,7 +23961,7 @@ msgstr ""
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -23963,7 +24013,7 @@ msgstr ""
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr ""
@@ -24726,7 +24776,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24799,7 +24849,7 @@ msgstr ""
msgid "Incorrect Stock Value Report"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr ""
@@ -24966,13 +25016,13 @@ msgstr ""
msgid "Inspected By"
msgstr "Diperiksa Oleh"
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr ""
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr "Inspeksi Diperlukan"
@@ -24989,7 +25039,7 @@ msgstr ""
msgid "Inspection Required before Purchase"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr ""
@@ -25019,7 +25069,7 @@ msgstr "Nota Installasi"
msgid "Installation Note Item"
msgstr "Laporan Instalasi Stok Barang"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr "Instalasi Catatan {0} telah Terkirim"
@@ -25077,7 +25127,7 @@ msgstr "Izin Tidak Cukup"
#: 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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "Persediaan tidak cukup"
@@ -25268,7 +25318,7 @@ msgstr ""
msgid "Internal Work History"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr ""
@@ -25304,7 +25354,7 @@ msgid "Invalid Account"
msgstr "Akun tidak berlaku"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr ""
@@ -25332,7 +25382,7 @@ msgstr "Pesanan Selimut Tidak Valid untuk Pelanggan dan Item yang dipilih"
msgid "Invalid Child Procedure"
msgstr "Prosedur Anak Tidak Valid"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr "Perusahaan Tidak Valid untuk Transaksi Antar Perusahaan."
@@ -25390,7 +25440,7 @@ msgid "Invalid Ledger Entries"
msgstr ""
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr "Entri Pembukaan Tidak Valid"
@@ -25418,7 +25468,7 @@ msgstr ""
msgid "Invalid Priority"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr ""
@@ -25502,8 +25552,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr ""
@@ -25511,7 +25561,7 @@ msgstr ""
msgid "Invalid {0}"
msgstr "Valid {0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr "{0} tidak valid untuk Transaksi Antar Perusahaan."
@@ -25721,7 +25771,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26773,6 +26823,8 @@ msgstr ""
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26791,7 +26843,11 @@ msgstr "Kode Item"
msgid "Item Code (Final Product)"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr ""
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr "Item Code tidak dapat diubah untuk Serial Number"
@@ -27195,6 +27251,7 @@ msgstr "Item Produsen"
#: 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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28115,7 +28172,7 @@ msgstr ""
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr "Jurnal Entri {0} tidak memiliki akun {1} atau sudah dicocokkan voucher lainnya"
@@ -28321,7 +28378,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29037,7 +29094,7 @@ msgstr "[Daerah"
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29708,7 +29765,7 @@ msgstr ""
msgid "Mandatory Depends On"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr ""
@@ -29798,6 +29855,7 @@ msgstr "Entri manual tidak dapat dibuat! Nonaktifkan entri otomatis untuk akunta
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30356,6 +30414,7 @@ msgid "Material Requested"
msgstr ""
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr ""
@@ -30711,7 +30770,7 @@ msgstr "Pesan"
msgid "Message Examples"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr "Pesan terkirim"
@@ -31025,8 +31084,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr "Akun Hilang"
@@ -31044,6 +31103,10 @@ msgstr ""
msgid "Missing Default in Company"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr ""
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr ""
@@ -31076,7 +31139,7 @@ msgstr "Hilang Nilai Diperlukan"
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr "Template email tidak ada untuk dikirim. Silakan set satu di Pengaturan Pengiriman."
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr ""
@@ -31742,7 +31805,7 @@ msgstr ""
msgid "Needs Analysis"
msgstr "Butuh analisa"
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr ""
@@ -32174,7 +32237,7 @@ msgstr ""
msgid "New Sales Person Name"
msgstr "Nama baru Sales Person"
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr "No. Seri baru tidak dapat memiliki Gudang. Gudang harus diatur oleh Entri Persediaan atau Nota Pembelian"
@@ -32210,7 +32273,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:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr "Tanggal rilis baru harus di masa depan"
@@ -32319,7 +32382,7 @@ msgstr "Tidak ada tindakan"
msgid "No Answer"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr "Tidak ada Pelanggan yang ditemukan untuk Transaksi Antar Perusahaan yang mewakili perusahaan {0}"
@@ -32376,9 +32439,9 @@ msgstr ""
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr "Tidak ada izin"
@@ -32413,7 +32476,7 @@ msgstr ""
msgid "No Summary"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr "Tidak ada Pemasok yang ditemukan untuk Transaksi Antar Perusahaan yang mewakili perusahaan {0}"
@@ -32511,7 +32574,7 @@ msgstr ""
msgid "No items to be received are overdue"
msgstr "Tidak ada barang yang akan diterima sudah lewat"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr ""
@@ -32645,11 +32708,11 @@ msgstr ""
msgid "No values"
msgstr "Tidak ada nilai"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr "Tidak ada {0} ditemukan untuk Transaksi Perusahaan Inter."
@@ -32684,7 +32747,7 @@ msgstr ""
msgid "Non Profit"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr "Item bukan stok"
@@ -32863,7 +32926,7 @@ msgstr ""
msgid "Note: Email will not be sent to disabled users"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr ""
@@ -32883,7 +32946,7 @@ msgstr "Catatan: Biaya Pusat ini adalah Group. Tidak bisa membuat entri akuntans
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr "Catatan: {0}"
@@ -32899,6 +32962,7 @@ msgstr "Catatan: {0}"
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33334,6 +33398,12 @@ msgstr ""
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr ""
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr ""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33535,8 +33605,8 @@ msgstr "Pembukaan (Dr)"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr "Membuka Penyusutan Akumulasi"
@@ -33578,7 +33648,7 @@ msgstr ""
msgid "Opening Entry"
msgstr ""
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr ""
@@ -33606,7 +33676,7 @@ msgid "Opening Invoice Item"
msgstr "Membuka Item Faktur"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 ""
@@ -33680,7 +33750,7 @@ msgstr ""
msgid "Operating Cost Per BOM Quantity"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr "Biaya Operasi sesuai Perintah Kerja / BOM"
@@ -33836,7 +33906,7 @@ msgstr "Operasi"
msgid "Operations Routing"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr "Operasi tidak dapat dibiarkan kosong"
@@ -34428,7 +34498,7 @@ msgstr ""
msgid "Over Picking Allowance"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr ""
@@ -34880,7 +34950,7 @@ msgstr "Stok Barang Kemasan"
msgid "Packed Items"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr ""
@@ -34915,7 +34985,7 @@ msgstr "Slip Packing"
msgid "Packing Slip Item"
msgstr "Packing Slip Stok Barang"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr "Packing slip (s) dibatalkan"
@@ -35001,7 +35071,7 @@ msgstr "Dibayar"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35276,7 +35346,7 @@ msgstr ""
msgid "Partial Payment in POS Transactions are not allowed."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr ""
@@ -35470,9 +35540,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35633,9 +35703,9 @@ 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35800,7 +35870,7 @@ msgstr ""
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -35936,7 +36006,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr "Entri pembayaran telah dimodifikasi setelah Anda menariknya. Silakan menariknya lagi."
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr "Entri Pembayaran sudah dibuat"
@@ -36145,7 +36215,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36171,11 +36241,11 @@ msgstr ""
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr "Permintaan Pembayaran untuk {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr ""
@@ -36333,7 +36403,7 @@ msgstr ""
msgid "Payment Unlink Error"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr "Pembayaran terhadap {0} {1} tidak dapat lebih besar dari Posisi Jumlah {2}"
@@ -36654,7 +36724,7 @@ msgstr "periode"
msgid "Period Based On"
msgstr "Berdasarkan Periode"
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr ""
@@ -37257,7 +37327,7 @@ msgstr "Harap tambahkan akun ke Perusahaan tingkat akar - {}"
msgid "Please add {1} role to user {0}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr ""
@@ -37265,7 +37335,7 @@ msgstr ""
msgid "Please attach CSV file"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr ""
@@ -37278,7 +37348,7 @@ msgstr ""
msgid "Please cancel related transaction."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr "Silakan periksa opsi Mata multi untuk memungkinkan account dengan mata uang lainnya"
@@ -37355,7 +37425,7 @@ msgstr "Harap buat tanda terima pembelian atau beli faktur untuk item {0}"
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr ""
@@ -37479,7 +37549,7 @@ msgstr "Cukup masukkan Nota Penerimaan terlebih dahulu"
msgid "Please enter Receipt Document"
msgstr "Masukkan Dokumen Penerimaan"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr "Harap masukkan tanggal Referensi"
@@ -37604,8 +37674,8 @@ msgstr "Pastikan Anda benar-benar ingin menghapus semua transaksi untuk perusaha
msgid "Please mention 'Weight UOM' along with Weight."
msgstr ""
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr ""
@@ -37733,7 +37803,7 @@ msgstr "Silakan pilih Posting Tanggal sebelum memilih Partai"
msgid "Please select Posting Date first"
msgstr "Silakan pilih Posting Tanggal terlebih dahulu"
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr "Silakan pilih Daftar Harga"
@@ -37765,7 +37835,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr "Silahkan pilih BOM"
@@ -37855,6 +37925,10 @@ msgstr "Silakan pilih nilai untuk {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
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr ""
@@ -37863,7 +37937,7 @@ msgstr ""
msgid "Please select atleast one operation to create Job Card"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr "Silakan pilih akun yang benar"
@@ -37944,15 +38018,15 @@ msgstr "Silahkan pilih {0} terlebih dahulu"
msgid "Please set 'Apply Additional Discount On'"
msgstr "Silahkan mengatur 'Terapkan Diskon tambahan On'"
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr "Silahkan mengatur 'Biaya Penyusutan Asset Center di Perusahaan {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr "Silahkan mengatur 'Gain / Loss Account pada Asset Disposal' di Perusahaan {0}"
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr ""
@@ -37960,7 +38034,7 @@ msgstr ""
msgid "Please set Account"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr ""
@@ -37986,7 +38060,7 @@ msgstr ""
msgid "Please set Company"
msgstr "Harap set Perusahaan"
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr "Silahkan mengatur Penyusutan Akun terkait Aset Kategori {0} atau Perusahaan {1}"
@@ -38004,7 +38078,7 @@ msgstr ""
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr ""
@@ -38067,7 +38141,7 @@ msgstr "Harap setel akun di Gudang {0}"
msgid "Please set an Address on the Company '%s'"
msgstr ""
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr ""
@@ -38083,23 +38157,23 @@ msgstr "Harap setel setidaknya satu baris di Tabel Pajak dan Biaya"
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr "Silakan set Cash standar atau rekening Bank Mode Pembayaran {0}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr "Harap setel Rekening Tunai atau Bank default dalam Cara Pembayaran {}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "Harap setel rekening Tunai atau Bank default dalam Mode Pembayaran {}"
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr ""
@@ -38203,7 +38277,7 @@ msgstr ""
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr ""
@@ -38216,7 +38290,7 @@ msgid "Please specify Company"
msgstr "Silakan tentukan Perusahaan"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr "Silahkan tentukan Perusahaan untuk melanjutkan"
@@ -38389,6 +38463,7 @@ msgstr "Beban pos"
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38423,11 +38498,11 @@ msgstr "Beban pos"
#: 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38446,6 +38521,7 @@ msgstr "Beban pos"
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38455,6 +38531,7 @@ msgstr "Beban pos"
#: 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_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
@@ -39020,6 +39097,14 @@ msgstr "Kode Item Aturan Harga"
msgid "Pricing Rule Item Group"
msgstr "Grup Item Aturan Harga"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr ""
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr ""
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr "Aturan Harga {0} diperbarui"
@@ -39078,6 +39163,10 @@ msgstr "Aturan Harga {0} diperbarui"
msgid "Pricing Rules"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr ""
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39465,7 +39554,7 @@ msgstr ""
msgid "Process Loss"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr ""
@@ -39955,7 +40044,7 @@ msgstr ""
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40430,7 +40519,7 @@ msgstr "Pembelian Analytics"
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr "Tanggal Pembelian"
@@ -40586,7 +40675,7 @@ msgstr "Master Manajer Pembelian"
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40762,9 +40851,9 @@ msgstr "Pembelian Daftar Harga"
#. 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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41645,6 +41734,7 @@ msgstr "Tujuan Tinjauan Kualitas"
#: 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/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
@@ -41761,7 +41851,7 @@ msgstr "Kuantitas tidak boleh lebih dari {0}"
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr "Kuantitas yang dibutuhkan untuk Item {0} di baris {1}"
@@ -42610,7 +42700,7 @@ msgid "Reason"
msgstr "Alasan"
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "Alasan untuk Puting On Hold"
@@ -43046,7 +43136,7 @@ msgstr ""
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr "Tukar Poin Loyalitas"
@@ -43178,7 +43268,7 @@ msgstr "Ref Tanggal"
msgid "Reference"
msgstr "Referensi"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr "Referensi # {0} tanggal {1}"
@@ -43316,7 +43406,7 @@ msgstr "nama referensi"
msgid "Reference No"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr "Referensi ada & Referensi Tanggal diperlukan untuk {0}"
@@ -43324,11 +43414,11 @@ msgstr "Referensi ada & Referensi Tanggal diperlukan untuk {0}"
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr "Referensi ada dan Tanggal referensi wajib untuk transaksi Bank"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr "Referensi ada adalah wajib jika Anda memasukkan Referensi Tanggal"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr "Nomor referensi."
@@ -43442,11 +43532,11 @@ msgstr "Referensi: {0}, Kode Item: {1} dan Pelanggan: {2}"
msgid "References"
msgstr "Referensi"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr ""
@@ -43591,8 +43681,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43611,7 +43701,7 @@ msgstr ""
msgid "Remaining"
msgstr "sisa"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr ""
@@ -43624,7 +43714,7 @@ msgstr "Saldo yang tersisa"
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr "Komentar"
@@ -43673,7 +43763,7 @@ msgstr "Komentar"
#: 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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -43984,7 +44074,7 @@ msgstr ""
msgid "Repost Status"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr ""
@@ -44308,7 +44398,7 @@ msgstr ""
msgid "Reseller"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr "Kirim Ulang Email Pembayaran"
@@ -44777,7 +44867,7 @@ msgstr "Retur"
msgid "Return / Credit Note"
msgstr "Nota Retur / Kredit"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr "Nota Retur / Debit"
@@ -45301,12 +45391,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1919
msgid "Row #{0} (Payment Table): Amount must be negative"
msgstr "Baris # {0} (Tabel Pembayaran): Jumlah harus negatif"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:515
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "Baris # {0} (Tabel Pembayaran): Jumlah harus positif"
@@ -45452,7 +45542,7 @@ msgstr "Baris # {0}: Entri duplikat di Referensi {1} {2}"
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr "Baris # {0}: Tanggal Pengiriman yang diharapkan tidak boleh sebelum Tanggal Pemesanan Pembelian"
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr ""
@@ -45476,11 +45566,11 @@ msgstr ""
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr ""
@@ -45500,7 +45590,7 @@ msgstr "Baris # {0}: Item ditambahkan"
msgid "Row #{0}: Item {1} does not exist"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr ""
@@ -45536,7 +45626,7 @@ msgstr ""
msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
msgstr "Row # {0}: Tidak diperbolehkan untuk mengubah Supplier sebagai Purchase Order sudah ada"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr ""
@@ -45581,15 +45671,15 @@ msgstr ""
msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr ""
@@ -45598,7 +45688,7 @@ msgstr ""
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "Baris # {0}: Kuantitas barang {1} tidak boleh nol."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr ""
@@ -45692,19 +45782,19 @@ msgstr "Baris # {0}: Status harus {1} untuk Diskon Faktur {2}"
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr ""
@@ -45712,8 +45802,8 @@ msgstr ""
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr ""
@@ -45894,7 +45984,7 @@ msgstr ""
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr ""
@@ -45902,11 +45992,11 @@ msgstr ""
msgid "Row {0}: Activity Type is mandatory."
msgstr "Row {0}: Jenis Kegiatan adalah wajib."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr "Baris {0}: Uang muka dari Pelanggan harus kredit"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr "Row {0}: Muka melawan Supplier harus mendebet"
@@ -45926,7 +46016,7 @@ msgstr ""
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr "Row {0}: Bill of Material tidak ditemukan Item {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr ""
@@ -45942,7 +46032,7 @@ msgstr ""
msgid "Row {0}: Cost center is required for an item {1}"
msgstr "Baris {0}: Pusat biaya diperlukan untuk item {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr "Baris {0}: entry Kredit tidak dapat dihubungkan dengan {1}"
@@ -45950,7 +46040,7 @@ msgstr "Baris {0}: entry Kredit tidak dapat dihubungkan dengan {1}"
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr "Row {0}: Mata dari BOM # {1} harus sama dengan mata uang yang dipilih {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr "Baris {0}: Debit masuk tidak dapat dihubungkan dengan {1}"
@@ -45966,7 +46056,7 @@ msgstr "Baris {0}: Tanggal Jatuh Tempo di tabel Ketentuan Pembayaran tidak boleh
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "Row {0}: Kurs adalah wajib"
@@ -46000,7 +46090,7 @@ msgstr "Row {0}: Dari Waktu dan To Waktu adalah wajib."
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr "Row {0}: Dari Waktu dan Untuk Waktu {1} adalah tumpang tindih dengan {2}"
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46012,7 +46102,7 @@ msgstr "Baris {0}: Dari waktu ke waktu harus kurang dari ke waktu"
msgid "Row {0}: Hours value must be greater than zero."
msgstr "Row {0}: nilai Jam harus lebih besar dari nol."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr "Row {0}: referensi tidak valid {1}"
@@ -46036,7 +46126,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr ""
@@ -46044,7 +46134,7 @@ msgstr ""
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr "Row {0}: Partai / Rekening tidak sesuai dengan {1} / {2} di {3} {4}"
@@ -46056,11 +46146,11 @@ msgstr "Row {0}: Partai Jenis dan Partai diperlukan untuk Piutang / Hutang akun
msgid "Row {0}: Payment Term is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr "Baris {0}: Pembayaran terhadap Penjualan / Purchase Order harus selalu ditandai sebagai muka"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr "Baris {0}: Silakan periksa 'Apakah Muka' terhadap Rekening {1} jika ini adalah sebuah entri muka."
@@ -46128,7 +46218,7 @@ msgstr ""
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr "Baris {0}: Item Subkontrak wajib untuk bahan mentah {1}"
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46152,7 +46242,7 @@ msgstr ""
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "Row {0}: UOM Faktor Konversi adalah wajib"
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr ""
@@ -46173,7 +46263,7 @@ msgstr "Baris {0}: {1} harus lebih besar dari 0"
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr "Baris {0}: {1} {2} tidak cocok dengan {3}"
@@ -46566,7 +46656,7 @@ msgstr ""
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr "Faktur Penjualan {0} telah terkirim"
@@ -46795,7 +46885,7 @@ msgstr ""
msgid "Sales Order Trends"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr "Sales Order yang diperlukan untuk Item {0}"
@@ -47305,8 +47395,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47577,7 +47667,7 @@ msgstr ""
msgid "Scrap Warehouse"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr ""
@@ -47650,7 +47740,7 @@ msgstr ""
msgid "Section"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr "Kode Bagian"
@@ -48020,7 +48110,7 @@ msgstr ""
msgid "Selected POS Opening Entry should be open."
msgstr "Entri Pembukaan POS yang dipilih harus terbuka."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr "Daftar Harga yang Dipilih harus memiliki bidang penjualan dan pembelian yang dicentang."
@@ -48204,7 +48294,7 @@ msgstr ""
msgid "Sender"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr "Mengirim"
@@ -48328,7 +48418,9 @@ msgstr ""
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48359,7 +48451,9 @@ msgid "Serial No Count"
msgstr ""
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr ""
@@ -48367,7 +48461,7 @@ msgstr ""
msgid "Serial No Range"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr ""
@@ -48407,6 +48501,13 @@ msgstr "Serial dan Batch"
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr ""
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr ""
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr ""
@@ -48436,7 +48537,7 @@ msgstr "Serial ada {0} bukan milik Stok Barang {1}"
msgid "Serial No {0} does not exist"
msgstr "Serial ada {0} tidak ada"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr ""
@@ -48485,7 +48586,7 @@ msgstr ""
msgid "Serial Nos and Batches"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr ""
@@ -48563,11 +48664,11 @@ msgstr ""
msgid "Serial and Batch Bundle"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr ""
@@ -49001,7 +49102,7 @@ msgstr ""
msgid "Set Loyalty Program"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr "Setel Tanggal Rilis Baru"
@@ -49256,7 +49357,7 @@ msgstr ""
msgid "Setting up company"
msgstr "Mendirikan perusahaan"
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49440,7 +49541,7 @@ msgstr ""
msgid "Shipment details"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr "Pengiriman"
@@ -49687,6 +49788,10 @@ msgstr "Tunjukkan Entri yang Dibatalkan"
msgid "Show Completed"
msgstr "Tampilkan Selesai"
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr ""
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr "Tampilkan Jumlah Kumulatif"
@@ -49802,7 +49907,7 @@ msgstr ""
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr ""
@@ -50107,13 +50212,27 @@ msgstr "Sumber"
msgid "Source DocType"
msgstr ""
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr ""
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr ""
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr ""
@@ -50184,7 +50303,7 @@ msgstr ""
msgid "Source Warehouse Address Link"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr ""
@@ -50695,7 +50814,7 @@ msgstr ""
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51038,7 +51157,7 @@ msgstr "Entri Persediaan {0} dibuat"
msgid "Stock Entry {0} has created"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr "Entri Persediaan {0} tidak terkirim"
@@ -51261,13 +51380,13 @@ msgstr ""
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51276,13 +51395,13 @@ msgstr ""
msgid "Stock Reservation"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr ""
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr ""
@@ -51304,7 +51423,7 @@ msgstr ""
msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr ""
@@ -51549,7 +51668,7 @@ msgstr ""
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr ""
@@ -51565,7 +51684,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr ""
@@ -52433,10 +52552,15 @@ msgstr "Qty Disupply"
#: 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr ""
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52549,7 +52673,7 @@ msgstr ""
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr "Tanggal Faktur Supplier"
@@ -52563,8 +52687,8 @@ msgstr "Pemasok Faktur Tanggal tidak dapat lebih besar dari Posting Tanggal"
#: 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "Nomor Faktur Supplier"
@@ -53111,16 +53235,16 @@ msgstr ""
msgid "System will notify to increase or decrease quantity or amount "
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr ""
@@ -53137,7 +53261,7 @@ msgstr ""
msgid "TDS Payable"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr ""
@@ -53693,7 +53817,7 @@ msgstr ""
msgid "Tax Withheld Vouchers"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr ""
@@ -54318,7 +54442,7 @@ msgstr "Akses ke Permintaan Penawaran Dari Portal Dinonaktifkan. Untuk Mengizink
msgid "The BOM which will be replaced"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr ""
@@ -54346,7 +54470,7 @@ msgstr ""
msgid "The Loyalty Program isn't valid for the selected company"
msgstr "Program Loyalitas tidak berlaku untuk perusahaan yang dipilih"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr ""
@@ -54370,7 +54494,7 @@ msgstr ""
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr ""
@@ -54392,7 +54516,7 @@ msgstr ""
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr ""
@@ -54433,7 +54557,7 @@ msgstr "Bidang Dari Pemegang Saham tidak boleh kosong"
msgid "The field To Shareholder cannot be blank"
msgstr "Bidang Ke Pemegang Saham tidak boleh kosong"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr ""
@@ -54449,7 +54573,7 @@ msgstr "Nomor folio tidak sesuai"
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr ""
@@ -54710,6 +54834,10 @@ msgstr ""
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr "Ada pemeliharaan atau perbaikan aktif terhadap aset. Anda harus menyelesaikan semuanya sebelum membatalkan aset."
@@ -54976,7 +55104,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr ""
@@ -54984,7 +55112,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr ""
@@ -55759,6 +55887,10 @@ msgstr "Untuk mencakup pajak berturut-turut {0} di tingkat Stok Barang, pajak da
msgid "To merge, following properties must be same for both items"
msgstr "Untuk bergabung, sifat berikut harus sama untuk kedua item"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr "Untuk mengesampingkan ini, aktifkan '{0}' di perusahaan {1}"
@@ -55776,7 +55908,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr ""
@@ -55998,7 +56130,7 @@ msgstr ""
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56160,7 +56292,7 @@ msgstr "Jumlah Kredit / Jumlah Debet harus sama dengan Entri Jurnal terkait"
msgid "Total Debit"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr "Jumlah Debit harus sama dengan total kredit. Perbedaannya adalah {0}"
@@ -56753,6 +56885,10 @@ msgstr "Total"
msgid "Traceability"
msgstr "Lacak"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr ""
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56793,7 +56929,7 @@ msgstr ""
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -56891,7 +57027,7 @@ msgstr ""
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr "tipe transaksi"
@@ -56913,7 +57049,7 @@ msgstr "referensi transaksi tidak ada {0} tertanggal {1}"
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57510,7 +57646,11 @@ msgstr "Jumlah yang tidak terisi"
msgid "Unassigned Qty"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr "Bebaskan Blokir Faktur"
@@ -58877,7 +59017,7 @@ msgstr ""
msgid "Vendor Invoices"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr "Nama pedagang"
@@ -58944,7 +59084,7 @@ msgstr "Pengaturan video"
#: 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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59135,11 +59275,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59174,7 +59314,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr ""
@@ -59206,9 +59346,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59227,6 +59367,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_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
@@ -59436,6 +59577,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_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
@@ -59544,7 +59686,7 @@ msgstr ""
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr "Gudang tidak dapat dihapus karena ada entri buku persediaan untuk gudang ini."
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr "Gudang tidak dapat diubah untuk Serial Number"
@@ -59557,7 +59699,7 @@ msgid "Warehouse not found against the account {0}"
msgstr "Gudang tidak ditemukan melawan akun {0}"
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr "Gudang diperlukan untuk Barang Persediaan{0}"
@@ -59708,7 +59850,7 @@ msgstr ""
msgid "Warning!"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr "Peringatan: Ada {0} # {1} lain terhadap entri persediaan {2}"
@@ -60191,6 +60333,7 @@ msgstr "Pekerjaan Di Gudang Sedang Berlangsung"
#: 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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "Perintah kerja"
@@ -60666,7 +60809,7 @@ msgstr ""
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr "Anda tidak diperbolehkan memperbarui sesuai kondisi yang ditetapkan dalam {} Alur Kerja."
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr "Anda tidak diizinkan menambah atau memperbarui entri sebelum {0}"
@@ -60698,7 +60841,7 @@ msgstr "Anda juga dapat menyetel akun CWIP default di Perusahaan {}"
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr "Anda dapat mengubah akun induk menjadi akun Neraca atau memilih akun lain."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr "Anda tidak dapat memasukkan voucher saat ini di kolom 'Terhadap Entri Jurnal'"
@@ -60715,7 +60858,7 @@ msgstr "Anda hanya dapat menukarkan poin maksimum {0} dalam pesanan ini."
msgid "You can only select one mode of payment as default"
msgstr "Anda hanya dapat memilih satu jenis pembayaran sebagai default"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr "Anda dapat menebus hingga {0}."
@@ -60747,11 +60890,11 @@ msgstr ""
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr "Anda tidak dapat membuat atau membatalkan entri akuntansi apa pun dengan dalam Periode Akuntansi tertutup {0}"
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr "Anda tidak dapat mengkredit dan mendebit rekening yang sama secara bersamaan"
@@ -60767,7 +60910,7 @@ msgstr "Anda tidak dapat mengedit simpul root."
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr "Anda tidak dapat menebus lebih dari {0}."
@@ -60799,7 +60942,7 @@ msgstr "Anda tidak memiliki izin untuk {} item dalam {}."
msgid "You don't have enough Loyalty Points to redeem"
msgstr "Anda tidak memiliki Poin Loyalitas yang cukup untuk ditukarkan"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr "Anda tidak memiliki cukup poin untuk ditukarkan."
@@ -61225,7 +61368,7 @@ msgstr ""
msgid "to"
msgstr "untuk"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr ""
@@ -61265,7 +61408,7 @@ msgstr ""
msgid "{0} '{1}' is disabled"
msgstr "{0} '{1}' dinonaktifkan"
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr "{0} '{1}' tidak dalam Tahun Anggaran {2}"
@@ -61297,7 +61440,7 @@ msgstr "{0} Kupon yang digunakan adalah {1}. Kuantitas yang diizinkan habis"
msgid "{0} Digest"
msgstr ""
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr "{0} Nomor {1} sudah digunakan di {2} {3}"
@@ -61313,7 +61456,7 @@ msgstr "{0} Permintaan {1}"
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr "{0} Mempertahankan Sampel berdasarkan kelompok, harap centang Memiliki Nomor Kelompok untuk menyimpan sampel item"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr ""
@@ -61329,19 +61472,19 @@ msgstr ""
msgid "{0} account not found while submitting purchase receipt"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr "{0} terhadap Tagihan {1} tanggal {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr "{0} terhadap Purchase Order {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr "{0} terhadap Faktur Penjualan {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr "{0} terhadap Order Penjualan {1}"
@@ -61349,7 +61492,7 @@ msgstr "{0} terhadap Order Penjualan {1}"
msgid "{0} already has a Parent Procedure {1}."
msgstr "{0} sudah memiliki Prosedur Induk {1}."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr ""
@@ -61408,7 +61551,7 @@ msgstr "{0} dimasukan dua kali dalam Pajak Barang"
msgid "{0} entered twice {1} in Item Taxes"
msgstr ""
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr "{0} untuk {1}"
@@ -61461,7 +61604,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr "{0} adalah wajib untuk Item {1}"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr ""
@@ -61536,7 +61679,7 @@ msgstr "{0} item diproduksi"
msgid "{0} must be negative in return document"
msgstr "{0} harus negatif dalam dokumen retur"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr ""
@@ -61552,7 +61695,7 @@ msgstr "{0} parameter tidak valid"
msgid "{0} payment entries can not be filtered by {1}"
msgstr "{0} entri pembayaran tidak dapat disaring oleh {1}"
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr ""
@@ -61613,7 +61756,7 @@ msgstr ""
msgid "{0} {1} Manually"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr ""
@@ -61678,7 +61821,7 @@ msgstr "{0} {1} dibatalkan atau dihentikan"
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr "{0} {1} dibatalkan sehingga tindakan tidak dapat diselesaikan"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr "{0} {1} tertutup"
@@ -61690,7 +61833,7 @@ msgstr "{0} {1} dinonaktifkan"
msgid "{0} {1} is frozen"
msgstr "{0} {1} dibekukan"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr "{0} {1} telah ditagih sepenuhnya"
@@ -61702,12 +61845,12 @@ msgstr "{0} {1} tidak aktif"
msgid "{0} {1} is not associated with {2} {3}"
msgstr "{0} {1} tidak terkait dengan {2} {3}"
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr "{0} {1} belum dikirim"
@@ -61719,7 +61862,7 @@ msgstr ""
msgid "{0} {1} must be submitted"
msgstr "{0} {1} harus dikirim"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr ""
@@ -61754,7 +61897,7 @@ msgstr "{0} {1}: Akun {2} tidak aktif"
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr "{0} {1}: Entri Akuntansi untuk {2} hanya dapat dilakukan dalam bentuk mata uang: {3}"
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr "{0} {1}: \"Pusat Biaya\" adalah wajib untuk Item {2}"
@@ -61832,7 +61975,7 @@ msgstr ""
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr ""
@@ -61840,7 +61983,7 @@ msgstr ""
msgid "{ref_doctype} {ref_name} is {status}."
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr ""
@@ -61898,7 +62041,7 @@ msgstr ""
msgid "{} To Bill"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr "{} tidak dapat dibatalkan karena Poin Loyalitas yang diperoleh telah ditukarkan. Pertama batalkan {} Tidak {}"
diff --git a/erpnext/locale/it.po b/erpnext/locale/it.po
index 4aaf9781b5e..3b31c03c78f 100644
--- a/erpnext/locale/it.po
+++ b/erpnext/locale/it.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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-10 17:10\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:05\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Italian\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr " Articolo"
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr ""
msgid "'Default {0} Account' in Company {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr ""
@@ -840,11 +840,11 @@ msgstr ""
msgid "Your Shortcuts"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr ""
@@ -1215,10 +1215,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1523,7 +1523,7 @@ msgstr ""
msgid "Account {0}: You can not assign itself as parent account"
msgstr ""
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr ""
@@ -2012,7 +2012,7 @@ msgstr ""
msgid "Accounts Manager"
msgstr "Responsabile Contabilità"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr ""
@@ -2199,7 +2199,7 @@ msgstr ""
msgid "Accounts User"
msgstr "Utente Contabilità"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr ""
@@ -2559,6 +2559,10 @@ msgstr ""
msgid "Actual Expense"
msgstr ""
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr ""
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2696,7 +2700,7 @@ msgstr ""
msgid "Add Child"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr ""
@@ -3502,7 +3506,7 @@ msgstr ""
msgid "Advance amount cannot be greater than {0} {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr ""
@@ -3559,7 +3563,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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr ""
@@ -3628,7 +3632,7 @@ msgstr ""
msgid "Against Income Account"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr ""
@@ -3676,7 +3680,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr ""
@@ -3688,7 +3692,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr ""
@@ -3700,8 +3704,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr ""
@@ -3827,7 +3831,7 @@ msgstr ""
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr ""
@@ -3995,7 +3999,7 @@ msgstr ""
msgid "All items have already been Invoiced/Returned"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr ""
@@ -4021,7 +4025,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:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr ""
@@ -4907,7 +4911,7 @@ msgstr ""
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5047,7 +5051,7 @@ msgstr ""
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr ""
@@ -5198,7 +5202,7 @@ msgstr ""
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr ""
@@ -5781,7 +5785,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5823,7 +5827,7 @@ msgstr ""
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr ""
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr ""
@@ -5862,7 +5866,7 @@ msgstr ""
msgid "Asset Finance Book"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr ""
@@ -5938,7 +5942,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr ""
@@ -6024,9 +6028,9 @@ msgstr ""
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr ""
@@ -6055,7 +6059,7 @@ msgstr ""
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr ""
@@ -6087,7 +6091,7 @@ msgstr ""
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr ""
@@ -6099,11 +6103,11 @@ msgstr ""
msgid "Asset returned"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr ""
@@ -6128,7 +6132,7 @@ msgstr ""
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr ""
@@ -6161,7 +6165,15 @@ msgstr ""
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr ""
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr ""
@@ -6542,7 +6554,7 @@ msgstr ""
msgid "Auto Reconcile Payments"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr ""
@@ -6552,7 +6564,7 @@ msgstr ""
msgid "Auto Reconciliation Job Trigger"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr ""
@@ -6727,7 +6739,7 @@ msgstr ""
msgid "Available Batch Report"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr ""
@@ -6956,7 +6968,7 @@ msgstr ""
msgid "BOM 1"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr ""
@@ -7194,23 +7206,23 @@ msgstr ""
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr ""
@@ -7281,7 +7293,7 @@ msgstr ""
msgid "Balance (Dr - Cr)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr ""
@@ -7760,7 +7772,7 @@ msgstr ""
msgid "Base Tax Withholding Net Total"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr ""
@@ -7965,7 +7977,9 @@ msgstr ""
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -7976,7 +7990,7 @@ msgstr ""
msgid "Batch No is mandatory"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr ""
@@ -7999,7 +8013,7 @@ msgstr ""
msgid "Batch Nos"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr ""
@@ -8012,7 +8026,7 @@ msgstr ""
msgid "Batch Number Series"
msgstr ""
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr ""
@@ -8125,7 +8139,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8438,8 +8452,8 @@ msgstr ""
msgid "Blanket Order Rate"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr ""
@@ -8555,7 +8569,7 @@ msgstr ""
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr ""
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr ""
@@ -9329,7 +9343,7 @@ msgstr ""
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr ""
@@ -9515,7 +9529,7 @@ msgstr ""
msgid "Cannot Relieve Employee"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr ""
@@ -9531,6 +9545,10 @@ msgstr ""
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr ""
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr ""
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr ""
@@ -9620,7 +9638,7 @@ msgstr ""
msgid "Cannot create root account."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr ""
@@ -9637,7 +9655,7 @@ msgstr ""
msgid "Cannot delete Exchange Gain/Loss row"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr ""
@@ -10083,11 +10101,11 @@ msgstr "Catena"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr ""
@@ -10100,7 +10118,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr ""
@@ -10908,6 +10926,7 @@ msgstr ""
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11055,6 +11074,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11140,8 +11160,8 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11457,7 +11477,7 @@ msgstr ""
msgid "Company and Posting Date is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr ""
@@ -12738,7 +12758,7 @@ msgstr "Costo"
#: 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12757,7 +12777,7 @@ msgstr "Costo"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -12970,7 +12990,7 @@ msgstr ""
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr ""
@@ -13093,15 +13113,15 @@ msgstr "Cr"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13343,7 +13363,7 @@ msgstr ""
msgid "Create POS Opening Entry"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr ""
@@ -13499,7 +13519,7 @@ msgstr ""
msgid "Creating Delivery Note ..."
msgstr ""
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr ""
@@ -13519,7 +13539,7 @@ msgstr ""
msgid "Creating Purchase Order ..."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13556,11 +13576,6 @@ msgstr ""
msgid "Creation"
msgstr ""
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr ""
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr ""
@@ -13593,11 +13608,11 @@ msgstr ""
msgid "Credit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr ""
@@ -13740,7 +13755,7 @@ 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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr ""
@@ -13948,7 +13963,7 @@ msgstr "Tazza"
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14047,7 +14062,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr ""
@@ -14397,6 +14412,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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14424,6 +14440,10 @@ msgstr ""
msgid "Customer / Lead Address"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr ""
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14825,7 +14845,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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr ""
@@ -15177,7 +15197,7 @@ msgstr ""
msgid "Date of Joining"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr ""
@@ -15314,11 +15334,11 @@ msgstr ""
msgid "Debit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr ""
@@ -15392,7 +15412,7 @@ msgstr ""
msgid "Debit To is required"
msgstr ""
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr ""
@@ -16459,7 +16479,7 @@ msgstr ""
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16534,9 +16554,9 @@ msgstr ""
msgid "Depreciate based on shifts"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr ""
@@ -16592,6 +16612,14 @@ msgstr ""
msgid "Depreciation Entry Posting Status"
msgstr ""
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr ""
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16600,7 +16628,7 @@ msgstr ""
msgid "Depreciation Expense Account"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr ""
@@ -17486,6 +17514,10 @@ msgstr ""
msgid "Discount Percentage"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr ""
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr ""
@@ -17718,7 +17750,7 @@ msgstr ""
msgid "Disposal Date"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr ""
@@ -17998,7 +18030,7 @@ msgstr ""
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr ""
@@ -19037,7 +19069,7 @@ msgstr ""
msgid "Ems(Pica)"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr ""
@@ -19388,7 +19420,7 @@ msgstr ""
msgid "Enter a name for this Holiday List."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr ""
@@ -19449,7 +19481,7 @@ msgstr ""
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr ""
@@ -19469,7 +19501,7 @@ msgid "Entity"
msgstr "Entità"
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19564,7 +19596,7 @@ msgstr ""
msgid "Error in party matching for Bank Transaction {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr ""
@@ -19614,10 +19646,8 @@ msgstr ""
msgid "Evaluation Period"
msgstr ""
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
msgstr ""
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
@@ -19979,7 +20009,7 @@ msgstr ""
msgid "Expense"
msgstr ""
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr ""
@@ -20024,7 +20054,7 @@ msgstr ""
msgid "Expense Account"
msgstr ""
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr ""
@@ -20331,7 +20361,7 @@ msgstr ""
msgid "Failure Description"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr ""
@@ -21007,6 +21037,10 @@ msgstr ""
msgid "Fixed Asset Register"
msgstr ""
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21137,7 +21171,7 @@ msgstr ""
msgid "For Item"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr ""
@@ -22029,7 +22063,7 @@ msgstr ""
msgid "Future Payments"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr ""
@@ -22045,7 +22079,7 @@ msgstr ""
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr ""
@@ -22311,8 +22345,8 @@ msgid "Get Items"
msgstr ""
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22671,7 +22705,7 @@ msgstr ""
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22681,7 +22715,7 @@ msgstr ""
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22802,8 +22836,8 @@ msgstr ""
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr ""
@@ -23154,7 +23188,7 @@ msgstr ""
msgid "Height (cm)"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr "Ciao,"
@@ -23193,7 +23227,7 @@ msgstr ""
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr ""
@@ -23289,7 +23323,7 @@ msgstr ""
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr ""
@@ -23383,6 +23417,10 @@ msgstr ""
msgid "Hours Spent"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr ""
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23719,6 +23757,10 @@ msgstr ""
msgid "If more than one package of the same type (for print)"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr ""
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23735,6 +23777,10 @@ msgstr ""
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr ""
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23817,6 +23863,10 @@ msgstr ""
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr ""
@@ -23911,7 +23961,7 @@ msgstr ""
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -23963,7 +24013,7 @@ msgstr ""
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr ""
@@ -24726,7 +24776,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24799,7 +24849,7 @@ msgstr ""
msgid "Incorrect Stock Value Report"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr ""
@@ -24966,13 +25016,13 @@ msgstr ""
msgid "Inspected By"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr ""
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr ""
@@ -24989,7 +25039,7 @@ msgstr ""
msgid "Inspection Required before Purchase"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr ""
@@ -25019,7 +25069,7 @@ msgstr ""
msgid "Installation Note Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr ""
@@ -25077,7 +25127,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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr ""
@@ -25268,7 +25318,7 @@ msgstr ""
msgid "Internal Work History"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr ""
@@ -25304,7 +25354,7 @@ msgid "Invalid Account"
msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr ""
@@ -25332,7 +25382,7 @@ msgstr ""
msgid "Invalid Child Procedure"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr ""
@@ -25390,7 +25440,7 @@ msgid "Invalid Ledger Entries"
msgstr ""
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr ""
@@ -25418,7 +25468,7 @@ msgstr ""
msgid "Invalid Priority"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr ""
@@ -25502,8 +25552,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr ""
@@ -25511,7 +25561,7 @@ msgstr ""
msgid "Invalid {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr ""
@@ -25721,7 +25771,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26773,6 +26823,8 @@ msgstr ""
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26791,7 +26843,11 @@ msgstr ""
msgid "Item Code (Final Product)"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr ""
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr ""
@@ -27195,6 +27251,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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28115,7 +28172,7 @@ msgstr ""
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr ""
@@ -28321,7 +28378,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29037,7 +29094,7 @@ msgstr ""
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29708,7 +29765,7 @@ msgstr ""
msgid "Mandatory Depends On"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr ""
@@ -29798,6 +29855,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30356,6 +30414,7 @@ msgid "Material Requested"
msgstr ""
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr ""
@@ -30711,7 +30770,7 @@ msgstr ""
msgid "Message Examples"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr ""
@@ -31025,8 +31084,8 @@ msgstr "Mancante"
#: 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr ""
@@ -31044,6 +31103,10 @@ msgstr ""
msgid "Missing Default in Company"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr ""
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr ""
@@ -31076,7 +31139,7 @@ msgstr ""
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr ""
@@ -31742,7 +31805,7 @@ msgstr ""
msgid "Needs Analysis"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr ""
@@ -32174,7 +32237,7 @@ msgstr ""
msgid "New Sales Person Name"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr ""
@@ -32210,7 +32273,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:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr ""
@@ -32319,7 +32382,7 @@ msgstr ""
msgid "No Answer"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr ""
@@ -32376,9 +32439,9 @@ msgstr ""
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr ""
@@ -32413,7 +32476,7 @@ msgstr ""
msgid "No Summary"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr ""
@@ -32511,7 +32574,7 @@ msgstr ""
msgid "No items to be received are overdue"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr ""
@@ -32645,11 +32708,11 @@ msgstr ""
msgid "No values"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr ""
@@ -32684,7 +32747,7 @@ msgstr ""
msgid "Non Profit"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr ""
@@ -32863,7 +32926,7 @@ msgstr ""
msgid "Note: Email will not be sent to disabled users"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr ""
@@ -32883,7 +32946,7 @@ msgstr ""
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr ""
@@ -32899,6 +32962,7 @@ msgstr ""
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33334,6 +33398,12 @@ msgstr ""
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr ""
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr ""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33535,8 +33605,8 @@ msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr ""
@@ -33578,7 +33648,7 @@ msgstr ""
msgid "Opening Entry"
msgstr ""
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr ""
@@ -33606,7 +33676,7 @@ msgid "Opening Invoice Item"
msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 ""
@@ -33680,7 +33750,7 @@ msgstr ""
msgid "Operating Cost Per BOM Quantity"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr ""
@@ -33836,7 +33906,7 @@ msgstr ""
msgid "Operations Routing"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr ""
@@ -34428,7 +34498,7 @@ msgstr ""
msgid "Over Picking Allowance"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr ""
@@ -34880,7 +34950,7 @@ msgstr ""
msgid "Packed Items"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr ""
@@ -34915,7 +34985,7 @@ msgstr ""
msgid "Packing Slip Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr ""
@@ -35001,7 +35071,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35276,7 +35346,7 @@ msgstr ""
msgid "Partial Payment in POS Transactions are not allowed."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr ""
@@ -35470,9 +35540,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35633,9 +35703,9 @@ 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35800,7 +35870,7 @@ msgstr ""
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -35936,7 +36006,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr ""
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr ""
@@ -36145,7 +36215,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36171,11 +36241,11 @@ msgstr ""
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr ""
@@ -36333,7 +36403,7 @@ msgstr ""
msgid "Payment Unlink Error"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr ""
@@ -36654,7 +36724,7 @@ msgstr ""
msgid "Period Based On"
msgstr ""
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr ""
@@ -37257,7 +37327,7 @@ msgstr ""
msgid "Please add {1} role to user {0}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr ""
@@ -37265,7 +37335,7 @@ msgstr ""
msgid "Please attach CSV file"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr ""
@@ -37278,7 +37348,7 @@ msgstr ""
msgid "Please cancel related transaction."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr ""
@@ -37355,7 +37425,7 @@ msgstr ""
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr ""
@@ -37479,7 +37549,7 @@ msgstr ""
msgid "Please enter Receipt Document"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr ""
@@ -37604,8 +37674,8 @@ msgstr ""
msgid "Please mention 'Weight UOM' along with Weight."
msgstr ""
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr ""
@@ -37733,7 +37803,7 @@ msgstr ""
msgid "Please select Posting Date first"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr ""
@@ -37765,7 +37835,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr ""
@@ -37855,6 +37925,10 @@ 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
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr ""
@@ -37863,7 +37937,7 @@ msgstr ""
msgid "Please select atleast one operation to create Job Card"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr ""
@@ -37944,15 +38018,15 @@ msgstr ""
msgid "Please set 'Apply Additional Discount On'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr ""
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr ""
@@ -37960,7 +38034,7 @@ msgstr ""
msgid "Please set Account"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr ""
@@ -37986,7 +38060,7 @@ msgstr ""
msgid "Please set Company"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr ""
@@ -38004,7 +38078,7 @@ msgstr ""
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr ""
@@ -38067,7 +38141,7 @@ msgstr ""
msgid "Please set an Address on the Company '%s'"
msgstr ""
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr ""
@@ -38083,23 +38157,23 @@ msgstr ""
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr ""
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr ""
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr ""
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr ""
@@ -38203,7 +38277,7 @@ msgstr ""
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr ""
@@ -38216,7 +38290,7 @@ msgid "Please specify Company"
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr ""
@@ -38389,6 +38463,7 @@ msgstr ""
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38423,11 +38498,11 @@ 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38446,6 +38521,7 @@ msgstr ""
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38455,6 +38531,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_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
@@ -39020,6 +39097,14 @@ msgstr ""
msgid "Pricing Rule Item Group"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr ""
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr ""
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr ""
@@ -39078,6 +39163,10 @@ msgstr ""
msgid "Pricing Rules"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr ""
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39465,7 +39554,7 @@ msgstr ""
msgid "Process Loss"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr ""
@@ -39955,7 +40044,7 @@ msgstr ""
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40430,7 +40519,7 @@ msgstr ""
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr ""
@@ -40586,7 +40675,7 @@ msgstr "Direttore Acquisti"
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40762,9 +40851,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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41645,6 +41734,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/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
@@ -41761,7 +41851,7 @@ msgstr ""
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr ""
@@ -42610,7 +42700,7 @@ msgid "Reason"
msgstr ""
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr ""
@@ -43046,7 +43136,7 @@ msgstr ""
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr ""
@@ -43178,7 +43268,7 @@ msgstr ""
msgid "Reference"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr ""
@@ -43316,7 +43406,7 @@ msgstr ""
msgid "Reference No"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr ""
@@ -43324,11 +43414,11 @@ msgstr ""
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr ""
@@ -43442,11 +43532,11 @@ msgstr ""
msgid "References"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr ""
@@ -43591,8 +43681,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43611,7 +43701,7 @@ msgstr ""
msgid "Remaining"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr ""
@@ -43624,7 +43714,7 @@ msgstr ""
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr ""
@@ -43673,7 +43763,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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -43984,7 +44074,7 @@ msgstr ""
msgid "Repost Status"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr ""
@@ -44308,7 +44398,7 @@ msgstr ""
msgid "Reseller"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr ""
@@ -44777,7 +44867,7 @@ msgstr ""
msgid "Return / Credit Note"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr ""
@@ -45301,12 +45391,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: 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/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr ""
@@ -45452,7 +45542,7 @@ msgstr ""
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr ""
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr ""
@@ -45476,11 +45566,11 @@ msgstr ""
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr ""
@@ -45500,7 +45590,7 @@ msgstr ""
msgid "Row #{0}: Item {1} does not exist"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr ""
@@ -45536,7 +45626,7 @@ 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:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr ""
@@ -45581,15 +45671,15 @@ msgstr ""
msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr ""
@@ -45598,7 +45688,7 @@ msgstr ""
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr ""
@@ -45692,19 +45782,19 @@ msgstr ""
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr ""
@@ -45712,8 +45802,8 @@ msgstr ""
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr ""
@@ -45894,7 +45984,7 @@ msgstr ""
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr ""
@@ -45902,11 +45992,11 @@ msgstr ""
msgid "Row {0}: Activity Type is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr ""
@@ -45926,7 +46016,7 @@ msgstr ""
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr ""
@@ -45942,7 +46032,7 @@ msgstr ""
msgid "Row {0}: Cost center is required for an item {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr ""
@@ -45950,7 +46040,7 @@ msgstr ""
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr ""
@@ -45966,7 +46056,7 @@ msgstr ""
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr ""
@@ -46000,7 +46090,7 @@ msgstr ""
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46012,7 +46102,7 @@ msgstr ""
msgid "Row {0}: Hours value must be greater than zero."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr ""
@@ -46036,7 +46126,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr ""
@@ -46044,7 +46134,7 @@ msgstr ""
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr ""
@@ -46056,11 +46146,11 @@ msgstr ""
msgid "Row {0}: Payment Term is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr ""
@@ -46128,7 +46218,7 @@ msgstr ""
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46152,7 +46242,7 @@ msgstr ""
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr ""
@@ -46173,7 +46263,7 @@ msgstr ""
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr ""
@@ -46566,7 +46656,7 @@ msgstr ""
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr ""
@@ -46795,7 +46885,7 @@ msgstr ""
msgid "Sales Order Trends"
msgstr "Tendenze degli Ordini di Vendita"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr ""
@@ -47305,8 +47395,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47577,7 +47667,7 @@ msgstr ""
msgid "Scrap Warehouse"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr ""
@@ -47650,7 +47740,7 @@ msgstr ""
msgid "Section"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr ""
@@ -48020,7 +48110,7 @@ msgstr ""
msgid "Selected POS Opening Entry should be open."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr ""
@@ -48204,7 +48294,7 @@ msgstr ""
msgid "Sender"
msgstr "Mittente"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr ""
@@ -48328,7 +48418,9 @@ msgstr ""
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48359,7 +48451,9 @@ msgid "Serial No Count"
msgstr ""
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr ""
@@ -48367,7 +48461,7 @@ msgstr ""
msgid "Serial No Range"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr ""
@@ -48407,6 +48501,13 @@ msgstr ""
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr ""
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr ""
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr ""
@@ -48436,7 +48537,7 @@ msgstr ""
msgid "Serial No {0} does not exist"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr ""
@@ -48485,7 +48586,7 @@ msgstr ""
msgid "Serial Nos and Batches"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr ""
@@ -48563,11 +48664,11 @@ msgstr ""
msgid "Serial and Batch Bundle"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr ""
@@ -49001,7 +49102,7 @@ msgstr ""
msgid "Set Loyalty Program"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr ""
@@ -49256,7 +49357,7 @@ msgstr ""
msgid "Setting up company"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49440,7 +49541,7 @@ msgstr ""
msgid "Shipment details"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr ""
@@ -49687,6 +49788,10 @@ msgstr ""
msgid "Show Completed"
msgstr ""
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr ""
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr ""
@@ -49802,7 +49907,7 @@ msgstr ""
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr ""
@@ -50107,13 +50212,27 @@ msgstr ""
msgid "Source DocType"
msgstr ""
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr ""
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr ""
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr ""
@@ -50184,7 +50303,7 @@ msgstr ""
msgid "Source Warehouse Address Link"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr ""
@@ -50695,7 +50814,7 @@ msgstr ""
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51038,7 +51157,7 @@ msgstr ""
msgid "Stock Entry {0} has created"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr ""
@@ -51261,13 +51380,13 @@ msgstr ""
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51276,13 +51395,13 @@ msgstr ""
msgid "Stock Reservation"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr ""
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr ""
@@ -51304,7 +51423,7 @@ msgstr ""
msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr ""
@@ -51549,7 +51668,7 @@ msgstr ""
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr ""
@@ -51565,7 +51684,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr ""
@@ -52433,10 +52552,15 @@ 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "Fornitore"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr ""
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52549,7 +52673,7 @@ msgstr ""
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr ""
@@ -52563,8 +52687,8 @@ 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr ""
@@ -53111,16 +53235,16 @@ msgstr ""
msgid "System will notify to increase or decrease quantity or amount "
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr ""
@@ -53137,7 +53261,7 @@ msgstr ""
msgid "TDS Payable"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr ""
@@ -53693,7 +53817,7 @@ msgstr ""
msgid "Tax Withheld Vouchers"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr ""
@@ -54318,7 +54442,7 @@ msgstr ""
msgid "The BOM which will be replaced"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr ""
@@ -54346,7 +54470,7 @@ msgstr ""
msgid "The Loyalty Program isn't valid for the selected company"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr ""
@@ -54370,7 +54494,7 @@ msgstr ""
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr ""
@@ -54392,7 +54516,7 @@ msgstr ""
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr ""
@@ -54433,7 +54557,7 @@ msgstr ""
msgid "The field To Shareholder cannot be blank"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr ""
@@ -54449,7 +54573,7 @@ msgstr ""
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr ""
@@ -54710,6 +54834,10 @@ msgstr ""
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr ""
@@ -54976,7 +55104,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr ""
@@ -54984,7 +55112,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr ""
@@ -55759,6 +55887,10 @@ msgstr ""
msgid "To merge, following properties must be same for both items"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr ""
@@ -55776,7 +55908,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr ""
@@ -55998,7 +56130,7 @@ msgstr ""
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56160,7 +56292,7 @@ msgstr ""
msgid "Total Debit"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr ""
@@ -56753,6 +56885,10 @@ msgstr ""
msgid "Traceability"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr ""
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56793,7 +56929,7 @@ msgstr ""
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -56891,7 +57027,7 @@ msgstr ""
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr ""
@@ -56913,7 +57049,7 @@ msgstr ""
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57510,7 +57646,11 @@ msgstr ""
msgid "Unassigned Qty"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr ""
@@ -58877,7 +59017,7 @@ msgstr ""
msgid "Vendor Invoices"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr ""
@@ -58944,7 +59084,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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59135,11 +59275,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59174,7 +59314,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr ""
@@ -59206,9 +59346,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59227,6 +59367,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_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
@@ -59436,6 +59577,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_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
@@ -59544,7 +59686,7 @@ msgstr ""
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr ""
@@ -59557,7 +59699,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:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr ""
@@ -59708,7 +59850,7 @@ msgstr ""
msgid "Warning!"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr ""
@@ -60191,6 +60333,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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr ""
@@ -60666,7 +60809,7 @@ msgstr ""
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr ""
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr ""
@@ -60698,7 +60841,7 @@ msgstr ""
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr ""
@@ -60715,7 +60858,7 @@ msgstr ""
msgid "You can only select one mode of payment as default"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr ""
@@ -60747,11 +60890,11 @@ msgstr ""
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr ""
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr ""
@@ -60767,7 +60910,7 @@ msgstr ""
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr ""
@@ -60799,7 +60942,7 @@ msgstr ""
msgid "You don't have enough Loyalty Points to redeem"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr ""
@@ -61225,7 +61368,7 @@ msgstr ""
msgid "to"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr ""
@@ -61265,7 +61408,7 @@ msgstr "{0}"
msgid "{0} '{1}' is disabled"
msgstr ""
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr ""
@@ -61297,7 +61440,7 @@ msgstr ""
msgid "{0} Digest"
msgstr ""
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr ""
@@ -61313,7 +61456,7 @@ msgstr ""
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr ""
@@ -61329,19 +61472,19 @@ msgstr ""
msgid "{0} account not found while submitting purchase receipt"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr ""
@@ -61349,7 +61492,7 @@ msgstr ""
msgid "{0} already has a Parent Procedure {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr ""
@@ -61408,7 +61551,7 @@ msgstr ""
msgid "{0} entered twice {1} in Item Taxes"
msgstr ""
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr ""
@@ -61461,7 +61604,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr ""
@@ -61536,7 +61679,7 @@ msgstr ""
msgid "{0} must be negative in return document"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr ""
@@ -61552,7 +61695,7 @@ msgstr ""
msgid "{0} payment entries can not be filtered by {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr ""
@@ -61613,7 +61756,7 @@ msgstr ""
msgid "{0} {1} Manually"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr ""
@@ -61678,7 +61821,7 @@ msgstr ""
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr ""
@@ -61690,7 +61833,7 @@ msgstr ""
msgid "{0} {1} is frozen"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr ""
@@ -61702,12 +61845,12 @@ msgstr ""
msgid "{0} {1} is not associated with {2} {3}"
msgstr ""
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr ""
@@ -61719,7 +61862,7 @@ msgstr ""
msgid "{0} {1} must be submitted"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr ""
@@ -61754,7 +61897,7 @@ msgstr ""
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr ""
@@ -61832,7 +61975,7 @@ msgstr ""
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr ""
@@ -61840,7 +61983,7 @@ msgstr ""
msgid "{ref_doctype} {ref_name} is {status}."
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr "{}"
@@ -61898,7 +62041,7 @@ msgstr ""
msgid "{} To Bill"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr ""
diff --git a/erpnext/locale/nl.po b/erpnext/locale/nl.po
index 7836c9b9c84..761a46f2cb9 100644
--- a/erpnext/locale/nl.po
+++ b/erpnext/locale/nl.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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:10\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:06\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Dutch\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr ""
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr ""
msgid "'Default {0} Account' in Company {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr ""
@@ -840,11 +840,11 @@ msgstr ""
msgid "Your Shortcuts"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr ""
@@ -1215,10 +1215,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1523,7 +1523,7 @@ msgstr ""
msgid "Account {0}: You can not assign itself as parent account"
msgstr ""
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr ""
@@ -2012,7 +2012,7 @@ msgstr ""
msgid "Accounts Manager"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr ""
@@ -2199,7 +2199,7 @@ msgstr ""
msgid "Accounts User"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr ""
@@ -2559,6 +2559,10 @@ msgstr ""
msgid "Actual Expense"
msgstr ""
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr ""
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2696,7 +2700,7 @@ msgstr ""
msgid "Add Child"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr ""
@@ -3502,7 +3506,7 @@ msgstr ""
msgid "Advance amount cannot be greater than {0} {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr ""
@@ -3559,7 +3563,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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr ""
@@ -3628,7 +3632,7 @@ msgstr ""
msgid "Against Income Account"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr ""
@@ -3676,7 +3680,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr ""
@@ -3688,7 +3692,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr ""
@@ -3700,8 +3704,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr ""
@@ -3827,7 +3831,7 @@ msgstr ""
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr ""
@@ -3995,7 +3999,7 @@ msgstr ""
msgid "All items have already been Invoiced/Returned"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr ""
@@ -4021,7 +4025,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:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr ""
@@ -4907,7 +4911,7 @@ msgstr ""
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5047,7 +5051,7 @@ msgstr ""
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr ""
@@ -5198,7 +5202,7 @@ msgstr ""
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr ""
@@ -5781,7 +5785,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5823,7 +5827,7 @@ msgstr ""
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr ""
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr ""
@@ -5862,7 +5866,7 @@ msgstr ""
msgid "Asset Finance Book"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr ""
@@ -5938,7 +5942,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr ""
@@ -6024,9 +6028,9 @@ msgstr ""
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr ""
@@ -6055,7 +6059,7 @@ msgstr ""
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr ""
@@ -6087,7 +6091,7 @@ msgstr ""
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr ""
@@ -6099,11 +6103,11 @@ msgstr ""
msgid "Asset returned"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr ""
@@ -6128,7 +6132,7 @@ msgstr ""
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr ""
@@ -6161,7 +6165,15 @@ msgstr ""
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr ""
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr ""
@@ -6542,7 +6554,7 @@ msgstr ""
msgid "Auto Reconcile Payments"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr ""
@@ -6552,7 +6564,7 @@ msgstr ""
msgid "Auto Reconciliation Job Trigger"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr ""
@@ -6727,7 +6739,7 @@ msgstr ""
msgid "Available Batch Report"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr ""
@@ -6956,7 +6968,7 @@ msgstr ""
msgid "BOM 1"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr ""
@@ -7194,23 +7206,23 @@ msgstr ""
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr ""
@@ -7281,7 +7293,7 @@ msgstr ""
msgid "Balance (Dr - Cr)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr ""
@@ -7760,7 +7772,7 @@ msgstr ""
msgid "Base Tax Withholding Net Total"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr ""
@@ -7965,7 +7977,9 @@ msgstr ""
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -7976,7 +7990,7 @@ msgstr ""
msgid "Batch No is mandatory"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr ""
@@ -7999,7 +8013,7 @@ msgstr ""
msgid "Batch Nos"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr ""
@@ -8012,7 +8026,7 @@ msgstr ""
msgid "Batch Number Series"
msgstr ""
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr ""
@@ -8125,7 +8139,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8438,8 +8452,8 @@ msgstr ""
msgid "Blanket Order Rate"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr ""
@@ -8555,7 +8569,7 @@ msgstr ""
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr ""
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr ""
@@ -9329,7 +9343,7 @@ msgstr ""
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr ""
@@ -9515,7 +9529,7 @@ msgstr ""
msgid "Cannot Relieve Employee"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr ""
@@ -9531,6 +9545,10 @@ msgstr ""
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr ""
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr ""
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr ""
@@ -9620,7 +9638,7 @@ msgstr ""
msgid "Cannot create root account."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr ""
@@ -9637,7 +9655,7 @@ msgstr ""
msgid "Cannot delete Exchange Gain/Loss row"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr ""
@@ -10083,11 +10101,11 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr ""
@@ -10100,7 +10118,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr ""
@@ -10908,6 +10926,7 @@ msgstr ""
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11055,6 +11074,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11140,8 +11160,8 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11457,7 +11477,7 @@ msgstr ""
msgid "Company and Posting Date is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr ""
@@ -12738,7 +12758,7 @@ 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12757,7 +12777,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -12970,7 +12990,7 @@ msgstr ""
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr ""
@@ -13093,15 +13113,15 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13343,7 +13363,7 @@ msgstr ""
msgid "Create POS Opening Entry"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr ""
@@ -13499,7 +13519,7 @@ msgstr ""
msgid "Creating Delivery Note ..."
msgstr ""
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr ""
@@ -13519,7 +13539,7 @@ msgstr ""
msgid "Creating Purchase Order ..."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13556,11 +13576,6 @@ msgstr ""
msgid "Creation"
msgstr ""
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr ""
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr ""
@@ -13593,11 +13608,11 @@ msgstr ""
msgid "Credit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr ""
@@ -13740,7 +13755,7 @@ 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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr ""
@@ -13948,7 +13963,7 @@ msgstr ""
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14047,7 +14062,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr ""
@@ -14397,6 +14412,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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14424,6 +14440,10 @@ msgstr ""
msgid "Customer / Lead Address"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr ""
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14825,7 +14845,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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr ""
@@ -15177,7 +15197,7 @@ msgstr ""
msgid "Date of Joining"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr ""
@@ -15314,11 +15334,11 @@ msgstr ""
msgid "Debit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr ""
@@ -15392,7 +15412,7 @@ msgstr ""
msgid "Debit To is required"
msgstr ""
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr ""
@@ -16459,7 +16479,7 @@ msgstr ""
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16534,9 +16554,9 @@ msgstr ""
msgid "Depreciate based on shifts"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr ""
@@ -16592,6 +16612,14 @@ msgstr ""
msgid "Depreciation Entry Posting Status"
msgstr ""
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr ""
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16600,7 +16628,7 @@ msgstr ""
msgid "Depreciation Expense Account"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr ""
@@ -17486,6 +17514,10 @@ msgstr ""
msgid "Discount Percentage"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr ""
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr ""
@@ -17718,7 +17750,7 @@ msgstr ""
msgid "Disposal Date"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr ""
@@ -17998,7 +18030,7 @@ msgstr ""
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr ""
@@ -19037,7 +19069,7 @@ msgstr ""
msgid "Ems(Pica)"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr ""
@@ -19388,7 +19420,7 @@ msgstr ""
msgid "Enter a name for this Holiday List."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr ""
@@ -19449,7 +19481,7 @@ msgstr ""
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr ""
@@ -19469,7 +19501,7 @@ msgid "Entity"
msgstr ""
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19564,7 +19596,7 @@ msgstr ""
msgid "Error in party matching for Bank Transaction {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr ""
@@ -19614,10 +19646,8 @@ msgstr ""
msgid "Evaluation Period"
msgstr ""
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
msgstr ""
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
@@ -19979,7 +20009,7 @@ msgstr ""
msgid "Expense"
msgstr ""
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr ""
@@ -20024,7 +20054,7 @@ msgstr ""
msgid "Expense Account"
msgstr ""
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr ""
@@ -20331,7 +20361,7 @@ msgstr ""
msgid "Failure Description"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr ""
@@ -21007,6 +21037,10 @@ msgstr ""
msgid "Fixed Asset Register"
msgstr ""
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21137,7 +21171,7 @@ msgstr ""
msgid "For Item"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr ""
@@ -22029,7 +22063,7 @@ msgstr ""
msgid "Future Payments"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr ""
@@ -22045,7 +22079,7 @@ msgstr ""
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr ""
@@ -22311,8 +22345,8 @@ msgid "Get Items"
msgstr ""
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22671,7 +22705,7 @@ msgstr ""
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22681,7 +22715,7 @@ msgstr ""
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22802,8 +22836,8 @@ msgstr ""
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr ""
@@ -23154,7 +23188,7 @@ msgstr ""
msgid "Height (cm)"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr ""
@@ -23193,7 +23227,7 @@ msgstr ""
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr ""
@@ -23289,7 +23323,7 @@ msgstr ""
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr ""
@@ -23383,6 +23417,10 @@ msgstr ""
msgid "Hours Spent"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr ""
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23719,6 +23757,10 @@ msgstr ""
msgid "If more than one package of the same type (for print)"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr ""
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23735,6 +23777,10 @@ msgstr ""
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr ""
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23817,6 +23863,10 @@ msgstr ""
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr ""
@@ -23911,7 +23961,7 @@ msgstr ""
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -23963,7 +24013,7 @@ msgstr ""
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr ""
@@ -24726,7 +24776,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24799,7 +24849,7 @@ msgstr ""
msgid "Incorrect Stock Value Report"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr ""
@@ -24966,13 +25016,13 @@ msgstr ""
msgid "Inspected By"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr ""
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr ""
@@ -24989,7 +25039,7 @@ msgstr ""
msgid "Inspection Required before Purchase"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr ""
@@ -25019,7 +25069,7 @@ msgstr ""
msgid "Installation Note Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr ""
@@ -25077,7 +25127,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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr ""
@@ -25268,7 +25318,7 @@ msgstr ""
msgid "Internal Work History"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr ""
@@ -25304,7 +25354,7 @@ msgid "Invalid Account"
msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr ""
@@ -25332,7 +25382,7 @@ msgstr ""
msgid "Invalid Child Procedure"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr ""
@@ -25390,7 +25440,7 @@ msgid "Invalid Ledger Entries"
msgstr ""
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr ""
@@ -25418,7 +25468,7 @@ msgstr ""
msgid "Invalid Priority"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr ""
@@ -25502,8 +25552,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr ""
@@ -25511,7 +25561,7 @@ msgstr ""
msgid "Invalid {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr ""
@@ -25721,7 +25771,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26773,6 +26823,8 @@ msgstr ""
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26791,7 +26843,11 @@ msgstr ""
msgid "Item Code (Final Product)"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr ""
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr ""
@@ -27195,6 +27251,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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28115,7 +28172,7 @@ msgstr ""
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr ""
@@ -28321,7 +28378,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29037,7 +29094,7 @@ msgstr ""
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29708,7 +29765,7 @@ msgstr ""
msgid "Mandatory Depends On"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr ""
@@ -29798,6 +29855,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30356,6 +30414,7 @@ msgid "Material Requested"
msgstr ""
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr ""
@@ -30711,7 +30770,7 @@ msgstr ""
msgid "Message Examples"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr ""
@@ -31025,8 +31084,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr ""
@@ -31044,6 +31103,10 @@ msgstr ""
msgid "Missing Default in Company"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr ""
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr ""
@@ -31076,7 +31139,7 @@ msgstr ""
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr ""
@@ -31742,7 +31805,7 @@ msgstr ""
msgid "Needs Analysis"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr ""
@@ -32174,7 +32237,7 @@ msgstr ""
msgid "New Sales Person Name"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr ""
@@ -32210,7 +32273,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:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr ""
@@ -32319,7 +32382,7 @@ msgstr ""
msgid "No Answer"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr ""
@@ -32376,9 +32439,9 @@ msgstr ""
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr ""
@@ -32413,7 +32476,7 @@ msgstr ""
msgid "No Summary"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr ""
@@ -32511,7 +32574,7 @@ msgstr ""
msgid "No items to be received are overdue"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr ""
@@ -32645,11 +32708,11 @@ msgstr ""
msgid "No values"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr ""
@@ -32684,7 +32747,7 @@ msgstr ""
msgid "Non Profit"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr ""
@@ -32863,7 +32926,7 @@ msgstr ""
msgid "Note: Email will not be sent to disabled users"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr ""
@@ -32883,7 +32946,7 @@ msgstr ""
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr ""
@@ -32899,6 +32962,7 @@ msgstr ""
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33334,6 +33398,12 @@ msgstr ""
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr ""
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr ""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33535,8 +33605,8 @@ msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr ""
@@ -33578,7 +33648,7 @@ msgstr ""
msgid "Opening Entry"
msgstr ""
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr ""
@@ -33606,7 +33676,7 @@ msgid "Opening Invoice Item"
msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 ""
@@ -33680,7 +33750,7 @@ msgstr ""
msgid "Operating Cost Per BOM Quantity"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr ""
@@ -33836,7 +33906,7 @@ msgstr ""
msgid "Operations Routing"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr ""
@@ -34428,7 +34498,7 @@ msgstr ""
msgid "Over Picking Allowance"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr ""
@@ -34880,7 +34950,7 @@ msgstr ""
msgid "Packed Items"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr ""
@@ -34915,7 +34985,7 @@ msgstr ""
msgid "Packing Slip Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr ""
@@ -35001,7 +35071,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35276,7 +35346,7 @@ msgstr ""
msgid "Partial Payment in POS Transactions are not allowed."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr ""
@@ -35470,9 +35540,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35633,9 +35703,9 @@ 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35800,7 +35870,7 @@ msgstr ""
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -35936,7 +36006,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr ""
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr ""
@@ -36145,7 +36215,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36171,11 +36241,11 @@ msgstr ""
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr ""
@@ -36333,7 +36403,7 @@ msgstr ""
msgid "Payment Unlink Error"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr ""
@@ -36654,7 +36724,7 @@ msgstr ""
msgid "Period Based On"
msgstr ""
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr ""
@@ -37257,7 +37327,7 @@ msgstr ""
msgid "Please add {1} role to user {0}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr ""
@@ -37265,7 +37335,7 @@ msgstr ""
msgid "Please attach CSV file"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr ""
@@ -37278,7 +37348,7 @@ msgstr ""
msgid "Please cancel related transaction."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr ""
@@ -37355,7 +37425,7 @@ msgstr ""
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr ""
@@ -37479,7 +37549,7 @@ msgstr ""
msgid "Please enter Receipt Document"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr ""
@@ -37604,8 +37674,8 @@ msgstr ""
msgid "Please mention 'Weight UOM' along with Weight."
msgstr ""
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr ""
@@ -37733,7 +37803,7 @@ msgstr ""
msgid "Please select Posting Date first"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr ""
@@ -37765,7 +37835,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr ""
@@ -37855,6 +37925,10 @@ 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
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr ""
@@ -37863,7 +37937,7 @@ msgstr ""
msgid "Please select atleast one operation to create Job Card"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr ""
@@ -37944,15 +38018,15 @@ msgstr ""
msgid "Please set 'Apply Additional Discount On'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr ""
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr ""
@@ -37960,7 +38034,7 @@ msgstr ""
msgid "Please set Account"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr ""
@@ -37986,7 +38060,7 @@ msgstr ""
msgid "Please set Company"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr ""
@@ -38004,7 +38078,7 @@ msgstr ""
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr ""
@@ -38067,7 +38141,7 @@ msgstr ""
msgid "Please set an Address on the Company '%s'"
msgstr ""
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr ""
@@ -38083,23 +38157,23 @@ msgstr ""
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr ""
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr ""
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr ""
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr ""
@@ -38203,7 +38277,7 @@ msgstr ""
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr ""
@@ -38216,7 +38290,7 @@ msgid "Please specify Company"
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr ""
@@ -38389,6 +38463,7 @@ msgstr ""
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38423,11 +38498,11 @@ 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38446,6 +38521,7 @@ msgstr ""
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38455,6 +38531,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_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
@@ -39020,6 +39097,14 @@ msgstr ""
msgid "Pricing Rule Item Group"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr ""
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr ""
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr ""
@@ -39078,6 +39163,10 @@ msgstr ""
msgid "Pricing Rules"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr ""
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39465,7 +39554,7 @@ msgstr ""
msgid "Process Loss"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr ""
@@ -39955,7 +40044,7 @@ msgstr ""
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40430,7 +40519,7 @@ msgstr ""
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr ""
@@ -40586,7 +40675,7 @@ msgstr ""
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40762,9 +40851,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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41645,6 +41734,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/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
@@ -41761,7 +41851,7 @@ msgstr ""
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr ""
@@ -42610,7 +42700,7 @@ msgid "Reason"
msgstr ""
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr ""
@@ -43046,7 +43136,7 @@ msgstr ""
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr ""
@@ -43178,7 +43268,7 @@ msgstr ""
msgid "Reference"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr ""
@@ -43316,7 +43406,7 @@ msgstr ""
msgid "Reference No"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr ""
@@ -43324,11 +43414,11 @@ msgstr ""
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr ""
@@ -43442,11 +43532,11 @@ msgstr ""
msgid "References"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr ""
@@ -43591,8 +43681,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43611,7 +43701,7 @@ msgstr ""
msgid "Remaining"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr ""
@@ -43624,7 +43714,7 @@ msgstr ""
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr ""
@@ -43673,7 +43763,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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -43984,7 +44074,7 @@ msgstr ""
msgid "Repost Status"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr ""
@@ -44308,7 +44398,7 @@ msgstr ""
msgid "Reseller"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr ""
@@ -44777,7 +44867,7 @@ msgstr ""
msgid "Return / Credit Note"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr ""
@@ -45301,12 +45391,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: 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/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr ""
@@ -45452,7 +45542,7 @@ msgstr ""
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr ""
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr ""
@@ -45476,11 +45566,11 @@ msgstr ""
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr ""
@@ -45500,7 +45590,7 @@ msgstr ""
msgid "Row #{0}: Item {1} does not exist"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr ""
@@ -45536,7 +45626,7 @@ 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:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr ""
@@ -45581,15 +45671,15 @@ msgstr ""
msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr ""
@@ -45598,7 +45688,7 @@ msgstr ""
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr ""
@@ -45692,19 +45782,19 @@ msgstr ""
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr ""
@@ -45712,8 +45802,8 @@ msgstr ""
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr ""
@@ -45894,7 +45984,7 @@ msgstr ""
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr ""
@@ -45902,11 +45992,11 @@ msgstr ""
msgid "Row {0}: Activity Type is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr ""
@@ -45926,7 +46016,7 @@ msgstr ""
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr ""
@@ -45942,7 +46032,7 @@ msgstr ""
msgid "Row {0}: Cost center is required for an item {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr ""
@@ -45950,7 +46040,7 @@ msgstr ""
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr ""
@@ -45966,7 +46056,7 @@ msgstr ""
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr ""
@@ -46000,7 +46090,7 @@ msgstr ""
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46012,7 +46102,7 @@ msgstr ""
msgid "Row {0}: Hours value must be greater than zero."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr ""
@@ -46036,7 +46126,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr ""
@@ -46044,7 +46134,7 @@ msgstr ""
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr ""
@@ -46056,11 +46146,11 @@ msgstr ""
msgid "Row {0}: Payment Term is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr ""
@@ -46128,7 +46218,7 @@ msgstr ""
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46152,7 +46242,7 @@ msgstr ""
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr ""
@@ -46173,7 +46263,7 @@ msgstr ""
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr ""
@@ -46566,7 +46656,7 @@ msgstr ""
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr ""
@@ -46795,7 +46885,7 @@ msgstr ""
msgid "Sales Order Trends"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr ""
@@ -47305,8 +47395,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47577,7 +47667,7 @@ msgstr ""
msgid "Scrap Warehouse"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr ""
@@ -47650,7 +47740,7 @@ msgstr ""
msgid "Section"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr ""
@@ -48020,7 +48110,7 @@ msgstr ""
msgid "Selected POS Opening Entry should be open."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr ""
@@ -48204,7 +48294,7 @@ msgstr ""
msgid "Sender"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr ""
@@ -48328,7 +48418,9 @@ msgstr ""
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48359,7 +48451,9 @@ msgid "Serial No Count"
msgstr ""
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr ""
@@ -48367,7 +48461,7 @@ msgstr ""
msgid "Serial No Range"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr ""
@@ -48407,6 +48501,13 @@ msgstr ""
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr ""
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr ""
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr ""
@@ -48436,7 +48537,7 @@ msgstr ""
msgid "Serial No {0} does not exist"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr ""
@@ -48485,7 +48586,7 @@ msgstr ""
msgid "Serial Nos and Batches"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr ""
@@ -48563,11 +48664,11 @@ msgstr ""
msgid "Serial and Batch Bundle"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr ""
@@ -49001,7 +49102,7 @@ msgstr ""
msgid "Set Loyalty Program"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr ""
@@ -49256,7 +49357,7 @@ msgstr ""
msgid "Setting up company"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49440,7 +49541,7 @@ msgstr ""
msgid "Shipment details"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr ""
@@ -49687,6 +49788,10 @@ msgstr ""
msgid "Show Completed"
msgstr ""
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr ""
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr ""
@@ -49802,7 +49907,7 @@ msgstr ""
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr ""
@@ -50107,13 +50212,27 @@ msgstr ""
msgid "Source DocType"
msgstr ""
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr ""
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr ""
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr ""
@@ -50184,7 +50303,7 @@ msgstr ""
msgid "Source Warehouse Address Link"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr ""
@@ -50695,7 +50814,7 @@ msgstr ""
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51038,7 +51157,7 @@ msgstr ""
msgid "Stock Entry {0} has created"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr ""
@@ -51261,13 +51380,13 @@ msgstr ""
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51276,13 +51395,13 @@ msgstr ""
msgid "Stock Reservation"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr ""
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr ""
@@ -51304,7 +51423,7 @@ msgstr ""
msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr ""
@@ -51549,7 +51668,7 @@ msgstr ""
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr ""
@@ -51565,7 +51684,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr ""
@@ -52433,10 +52552,15 @@ 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr ""
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52549,7 +52673,7 @@ msgstr ""
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr ""
@@ -52563,8 +52687,8 @@ 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr ""
@@ -53111,16 +53235,16 @@ msgstr ""
msgid "System will notify to increase or decrease quantity or amount "
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr ""
@@ -53137,7 +53261,7 @@ msgstr ""
msgid "TDS Payable"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr ""
@@ -53693,7 +53817,7 @@ msgstr ""
msgid "Tax Withheld Vouchers"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr ""
@@ -54318,7 +54442,7 @@ msgstr ""
msgid "The BOM which will be replaced"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr ""
@@ -54346,7 +54470,7 @@ msgstr ""
msgid "The Loyalty Program isn't valid for the selected company"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr ""
@@ -54370,7 +54494,7 @@ msgstr ""
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr ""
@@ -54392,7 +54516,7 @@ msgstr ""
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr ""
@@ -54433,7 +54557,7 @@ msgstr ""
msgid "The field To Shareholder cannot be blank"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr ""
@@ -54449,7 +54573,7 @@ msgstr ""
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr ""
@@ -54710,6 +54834,10 @@ msgstr ""
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr ""
@@ -54976,7 +55104,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr ""
@@ -54984,7 +55112,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr ""
@@ -55759,6 +55887,10 @@ msgstr ""
msgid "To merge, following properties must be same for both items"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr ""
@@ -55776,7 +55908,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr ""
@@ -55998,7 +56130,7 @@ msgstr ""
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56160,7 +56292,7 @@ msgstr ""
msgid "Total Debit"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr ""
@@ -56753,6 +56885,10 @@ msgstr ""
msgid "Traceability"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr ""
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56793,7 +56929,7 @@ msgstr ""
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -56891,7 +57027,7 @@ msgstr ""
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr ""
@@ -56913,7 +57049,7 @@ msgstr ""
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57510,7 +57646,11 @@ msgstr ""
msgid "Unassigned Qty"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr ""
@@ -58877,7 +59017,7 @@ msgstr ""
msgid "Vendor Invoices"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr ""
@@ -58944,7 +59084,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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59135,11 +59275,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59174,7 +59314,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr ""
@@ -59206,9 +59346,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59227,6 +59367,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_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
@@ -59436,6 +59577,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_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
@@ -59544,7 +59686,7 @@ msgstr ""
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr ""
@@ -59557,7 +59699,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:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr ""
@@ -59708,7 +59850,7 @@ msgstr ""
msgid "Warning!"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr ""
@@ -60191,6 +60333,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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr ""
@@ -60666,7 +60809,7 @@ msgstr ""
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr ""
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr ""
@@ -60698,7 +60841,7 @@ msgstr ""
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr ""
@@ -60715,7 +60858,7 @@ msgstr ""
msgid "You can only select one mode of payment as default"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr ""
@@ -60747,11 +60890,11 @@ msgstr ""
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr ""
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr ""
@@ -60767,7 +60910,7 @@ msgstr ""
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr ""
@@ -60799,7 +60942,7 @@ msgstr ""
msgid "You don't have enough Loyalty Points to redeem"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr ""
@@ -61225,7 +61368,7 @@ msgstr ""
msgid "to"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr ""
@@ -61265,7 +61408,7 @@ msgstr ""
msgid "{0} '{1}' is disabled"
msgstr ""
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr ""
@@ -61297,7 +61440,7 @@ msgstr ""
msgid "{0} Digest"
msgstr ""
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr ""
@@ -61313,7 +61456,7 @@ msgstr ""
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr ""
@@ -61329,19 +61472,19 @@ msgstr ""
msgid "{0} account not found while submitting purchase receipt"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr ""
@@ -61349,7 +61492,7 @@ msgstr ""
msgid "{0} already has a Parent Procedure {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr ""
@@ -61408,7 +61551,7 @@ msgstr ""
msgid "{0} entered twice {1} in Item Taxes"
msgstr ""
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr ""
@@ -61461,7 +61604,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr ""
@@ -61536,7 +61679,7 @@ msgstr ""
msgid "{0} must be negative in return document"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr ""
@@ -61552,7 +61695,7 @@ msgstr ""
msgid "{0} payment entries can not be filtered by {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr ""
@@ -61613,7 +61756,7 @@ msgstr ""
msgid "{0} {1} Manually"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr ""
@@ -61678,7 +61821,7 @@ msgstr ""
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr ""
@@ -61690,7 +61833,7 @@ msgstr ""
msgid "{0} {1} is frozen"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr ""
@@ -61702,12 +61845,12 @@ msgstr ""
msgid "{0} {1} is not associated with {2} {3}"
msgstr ""
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr ""
@@ -61719,7 +61862,7 @@ msgstr ""
msgid "{0} {1} must be submitted"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr ""
@@ -61754,7 +61897,7 @@ msgstr ""
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr ""
@@ -61832,7 +61975,7 @@ msgstr ""
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr ""
@@ -61840,7 +61983,7 @@ msgstr ""
msgid "{ref_doctype} {ref_name} is {status}."
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr ""
@@ -61898,7 +62041,7 @@ msgstr ""
msgid "{} To Bill"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr ""
diff --git a/erpnext/locale/pl.po b/erpnext/locale/pl.po
index 51953121f85..dd062b31aae 100644
--- a/erpnext/locale/pl.po
+++ b/erpnext/locale/pl.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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:10\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:06\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Polish\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr ""
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr ""
msgid "'Default {0} Account' in Company {1}"
msgstr "„Domyślne konto {0} ” w firmie {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr ""
@@ -863,11 +863,11 @@ msgstr ""
msgid "Your Shortcuts"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr ""
@@ -1263,10 +1263,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1571,7 +1571,7 @@ msgstr ""
msgid "Account {0}: You can not assign itself as parent account"
msgstr ""
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr ""
@@ -2060,7 +2060,7 @@ msgstr ""
msgid "Accounts Manager"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr ""
@@ -2247,7 +2247,7 @@ msgstr ""
msgid "Accounts User"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr "Tabela kont nie może być pusta."
@@ -2607,6 +2607,10 @@ msgstr ""
msgid "Actual Expense"
msgstr ""
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr ""
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2744,7 +2748,7 @@ msgstr ""
msgid "Add Child"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr ""
@@ -3550,7 +3554,7 @@ msgstr "Kwota Zaliczki"
msgid "Advance amount cannot be greater than {0} {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr ""
@@ -3607,7 +3611,7 @@ msgstr "Wyklucza"
#: 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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr ""
@@ -3676,7 +3680,7 @@ msgstr "Konto wydatków"
msgid "Against Income Account"
msgstr "Konto przychodów"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr ""
@@ -3724,7 +3728,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr ""
@@ -3736,7 +3740,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr ""
@@ -3748,8 +3752,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr ""
@@ -3875,7 +3879,7 @@ msgstr ""
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr ""
@@ -4043,7 +4047,7 @@ msgstr ""
msgid "All items have already been Invoiced/Returned"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr ""
@@ -4069,7 +4073,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:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr ""
@@ -4955,7 +4959,7 @@ msgstr "Zmodyfikowany od"
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5095,7 +5099,7 @@ msgstr "Kwota Na rysunku"
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr ""
@@ -5246,7 +5250,7 @@ msgstr ""
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr ""
@@ -5829,7 +5833,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5871,7 +5875,7 @@ msgstr ""
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr ""
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr ""
@@ -5910,7 +5914,7 @@ msgstr ""
msgid "Asset Finance Book"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr ""
@@ -5986,7 +5990,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr ""
@@ -6072,9 +6076,9 @@ msgstr "Status zasobu"
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr ""
@@ -6103,7 +6107,7 @@ msgstr ""
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr ""
@@ -6135,7 +6139,7 @@ msgstr ""
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr ""
@@ -6147,11 +6151,11 @@ msgstr ""
msgid "Asset returned"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr "Zaleta złomowany poprzez Journal Entry {0}"
@@ -6176,7 +6180,7 @@ msgstr ""
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr ""
@@ -6209,7 +6213,15 @@ msgstr ""
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr ""
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr ""
@@ -6590,7 +6602,7 @@ msgstr ""
msgid "Auto Reconcile Payments"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr ""
@@ -6600,7 +6612,7 @@ msgstr ""
msgid "Auto Reconciliation Job Trigger"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr ""
@@ -6775,7 +6787,7 @@ msgstr "Dostępne w Warehouse partii Ilość"
msgid "Available Batch Report"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr ""
@@ -7004,7 +7016,7 @@ msgstr ""
msgid "BOM 1"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr ""
@@ -7242,23 +7254,23 @@ msgstr ""
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr ""
@@ -7329,7 +7341,7 @@ msgstr ""
msgid "Balance (Dr - Cr)"
msgstr "Balans (Dr - Cr)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr ""
@@ -7808,7 +7820,7 @@ msgstr ""
msgid "Base Tax Withholding Net Total"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr ""
@@ -8013,7 +8025,9 @@ msgstr ""
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -8024,7 +8038,7 @@ msgstr ""
msgid "Batch No is mandatory"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr ""
@@ -8047,7 +8061,7 @@ msgstr ""
msgid "Batch Nos"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr ""
@@ -8060,7 +8074,7 @@ msgstr ""
msgid "Batch Number Series"
msgstr "Seria numerów partii"
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr ""
@@ -8173,7 +8187,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8486,8 +8500,8 @@ msgstr ""
msgid "Blanket Order Rate"
msgstr "Ogólny koszt zamówienia"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr ""
@@ -8603,7 +8617,7 @@ msgstr "Zarezerwowany środek trwały"
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr ""
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr ""
@@ -9377,7 +9391,7 @@ msgstr ""
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr "Mogą jedynie wpłaty przed Unbilled {0}"
@@ -9563,7 +9577,7 @@ msgstr ""
msgid "Cannot Relieve Employee"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr ""
@@ -9579,6 +9593,10 @@ msgstr ""
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr ""
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr ""
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr ""
@@ -9668,7 +9686,7 @@ msgstr ""
msgid "Cannot create root account."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr ""
@@ -9685,7 +9703,7 @@ msgstr ""
msgid "Cannot delete Exchange Gain/Loss row"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr ""
@@ -10131,11 +10149,11 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr "Zmień Kwota"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr ""
@@ -10148,7 +10166,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr ""
@@ -10956,6 +10974,7 @@ msgstr ""
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11103,6 +11122,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11188,8 +11208,8 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11505,7 +11525,7 @@ msgstr ""
msgid "Company and Posting Date is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr ""
@@ -12786,7 +12806,7 @@ 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12805,7 +12825,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -13018,7 +13038,7 @@ msgstr ""
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr ""
@@ -13141,15 +13161,15 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13391,7 +13411,7 @@ msgstr ""
msgid "Create POS Opening Entry"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr ""
@@ -13547,7 +13567,7 @@ msgstr ""
msgid "Creating Delivery Note ..."
msgstr ""
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr ""
@@ -13567,7 +13587,7 @@ msgstr ""
msgid "Creating Purchase Order ..."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13604,11 +13624,6 @@ msgstr ""
msgid "Creation"
msgstr ""
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr ""
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr ""
@@ -13642,11 +13657,11 @@ msgstr ""
msgid "Credit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr ""
@@ -13789,7 +13804,7 @@ 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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr ""
@@ -13997,7 +14012,7 @@ msgstr ""
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14096,7 +14111,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr ""
@@ -14446,6 +14461,7 @@ msgstr "Niestandardowy?"
#: 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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14473,6 +14489,10 @@ msgstr ""
msgid "Customer / Lead Address"
msgstr "Adres Klienta / Tropu"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr ""
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14874,7 +14894,7 @@ msgstr "Klient wymagany dla „Rabat klientowy” "
#: 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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr ""
@@ -15226,7 +15246,7 @@ msgstr "Data wydania"
msgid "Date of Joining"
msgstr "Data Wstąpienia"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr ""
@@ -15363,11 +15383,11 @@ msgstr ""
msgid "Debit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr ""
@@ -15441,7 +15461,7 @@ msgstr ""
msgid "Debit To is required"
msgstr ""
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr ""
@@ -16508,7 +16528,7 @@ msgstr ""
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16583,9 +16603,9 @@ msgstr "Amortyzuj na podstawie dziennego pro-rata"
msgid "Depreciate based on shifts"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr ""
@@ -16641,6 +16661,14 @@ msgstr ""
msgid "Depreciation Entry Posting Status"
msgstr ""
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr ""
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16649,7 +16677,7 @@ msgstr ""
msgid "Depreciation Expense Account"
msgstr "Konto amortyzacji wydatków"
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr ""
@@ -17535,6 +17563,10 @@ msgstr ""
msgid "Discount Percentage"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr ""
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr ""
@@ -17767,7 +17799,7 @@ msgstr ""
msgid "Disposal Date"
msgstr "Utylizacja Data"
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr ""
@@ -18047,7 +18079,7 @@ msgstr ""
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr ""
@@ -19086,7 +19118,7 @@ msgstr ""
msgid "Ems(Pica)"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr ""
@@ -19437,7 +19469,7 @@ msgstr ""
msgid "Enter a name for this Holiday List."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr ""
@@ -19498,7 +19530,7 @@ msgstr ""
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr ""
@@ -19518,7 +19550,7 @@ msgid "Entity"
msgstr ""
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19613,7 +19645,7 @@ msgstr ""
msgid "Error in party matching for Bank Transaction {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr ""
@@ -19663,10 +19695,8 @@ msgstr ""
msgid "Evaluation Period"
msgstr "Okres próbny"
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
msgstr ""
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
@@ -20028,7 +20058,7 @@ msgstr "Przewidywany okres użytkowania wartości po"
msgid "Expense"
msgstr ""
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr ""
@@ -20073,7 +20103,7 @@ msgstr ""
msgid "Expense Account"
msgstr ""
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr ""
@@ -20380,7 +20410,7 @@ msgstr ""
msgid "Failure Description"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr ""
@@ -21056,6 +21086,10 @@ msgstr ""
msgid "Fixed Asset Register"
msgstr ""
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21186,7 +21220,7 @@ msgstr ""
msgid "For Item"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr ""
@@ -22078,7 +22112,7 @@ msgstr ""
msgid "Future Payments"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr ""
@@ -22094,7 +22128,7 @@ msgstr ""
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr ""
@@ -22360,8 +22394,8 @@ msgid "Get Items"
msgstr ""
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22720,7 +22754,7 @@ msgstr ""
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22730,7 +22764,7 @@ msgstr ""
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22851,8 +22885,8 @@ msgstr ""
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr ""
@@ -23203,7 +23237,7 @@ msgstr ""
msgid "Height (cm)"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr ""
@@ -23242,7 +23276,7 @@ msgstr ""
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr ""
@@ -23338,7 +23372,7 @@ msgstr ""
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr ""
@@ -23432,6 +23466,10 @@ msgstr ""
msgid "Hours Spent"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr ""
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23768,6 +23806,10 @@ msgstr ""
msgid "If more than one package of the same type (for print)"
msgstr "Jeśli więcej niż jedna paczka tego samego typu (do druku)"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr ""
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23784,6 +23826,10 @@ msgstr ""
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr ""
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23866,6 +23912,10 @@ msgstr ""
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr "W przypadku nielimitowanego wygaśnięcia punktów lojalnościowych czas trwania ważności jest pusty lub 0."
@@ -23960,7 +24010,7 @@ msgstr ""
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -24012,7 +24062,7 @@ msgstr ""
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr ""
@@ -24775,7 +24825,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24848,7 +24898,7 @@ msgstr ""
msgid "Incorrect Stock Value Report"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr ""
@@ -25015,13 +25065,13 @@ msgstr "Wstaw nowe rekordy"
msgid "Inspected By"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr ""
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr ""
@@ -25038,7 +25088,7 @@ msgstr "Wymagane Kontrola przed dostawą"
msgid "Inspection Required before Purchase"
msgstr "Wymagane Kontrola przed zakupem"
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr ""
@@ -25068,7 +25118,7 @@ msgstr ""
msgid "Installation Note Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr ""
@@ -25126,7 +25176,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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr ""
@@ -25317,7 +25367,7 @@ msgstr ""
msgid "Internal Work History"
msgstr "Wewnętrzne Historia Pracuj"
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr ""
@@ -25353,7 +25403,7 @@ msgid "Invalid Account"
msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr ""
@@ -25381,7 +25431,7 @@ msgstr ""
msgid "Invalid Child Procedure"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr ""
@@ -25439,7 +25489,7 @@ msgid "Invalid Ledger Entries"
msgstr ""
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr ""
@@ -25467,7 +25517,7 @@ msgstr ""
msgid "Invalid Priority"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr ""
@@ -25551,8 +25601,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr ""
@@ -25560,7 +25610,7 @@ msgstr ""
msgid "Invalid {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr ""
@@ -25770,7 +25820,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26822,6 +26872,8 @@ msgstr "poz Koszyk"
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26840,7 +26892,11 @@ msgstr ""
msgid "Item Code (Final Product)"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr ""
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr ""
@@ -27244,6 +27300,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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28164,7 +28221,7 @@ msgstr "Księgowanie na złom"
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr ""
@@ -28370,7 +28427,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29086,7 +29143,7 @@ msgstr ""
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29757,7 +29814,7 @@ msgstr ""
msgid "Mandatory Depends On"
msgstr "Obowiązkowe zależy od"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr ""
@@ -29847,6 +29904,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30405,6 +30463,7 @@ msgid "Material Requested"
msgstr ""
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr ""
@@ -30760,7 +30819,7 @@ msgstr ""
msgid "Message Examples"
msgstr "Przykłady wiadomości"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr "Widomość wysłana"
@@ -31074,8 +31133,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr ""
@@ -31093,6 +31152,10 @@ msgstr ""
msgid "Missing Default in Company"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr ""
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr ""
@@ -31125,7 +31188,7 @@ msgstr ""
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr ""
@@ -31791,7 +31854,7 @@ msgstr "Gazu ziemnego"
msgid "Needs Analysis"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr ""
@@ -32223,7 +32286,7 @@ msgstr ""
msgid "New Sales Person Name"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr ""
@@ -32259,7 +32322,7 @@ msgstr ""
msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date"
msgstr "Nowe faktury będą generowane zgodnie z harmonogramem, nawet jeśli bieżące faktury są niezapłacone lub przeterminowane"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr ""
@@ -32368,7 +32431,7 @@ msgstr ""
msgid "No Answer"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr ""
@@ -32425,9 +32488,9 @@ msgstr ""
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr ""
@@ -32462,7 +32525,7 @@ msgstr ""
msgid "No Summary"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr ""
@@ -32560,7 +32623,7 @@ msgstr ""
msgid "No items to be received are overdue"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr ""
@@ -32694,11 +32757,11 @@ msgstr ""
msgid "No values"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr ""
@@ -32733,7 +32796,7 @@ msgstr ""
msgid "Non Profit"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr ""
@@ -32912,7 +32975,7 @@ msgstr ""
msgid "Note: Email will not be sent to disabled users"
msgstr "Uwaga: E-mail nie zostanie wysłany do nieaktywnych użytkowników"
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr ""
@@ -32932,7 +32995,7 @@ msgstr ""
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr ""
@@ -32948,6 +33011,7 @@ msgstr ""
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33383,6 +33447,12 @@ msgstr ""
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr ""
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr ""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33584,8 +33654,8 @@ msgstr "Otwarcie (Wn)"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr ""
@@ -33627,7 +33697,7 @@ msgstr "Data Otwarcia"
msgid "Opening Entry"
msgstr "Wpis początkowy"
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr ""
@@ -33655,7 +33725,7 @@ msgid "Opening Invoice Item"
msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 "Faktura otwarcia ma korektę zaokrąglenia w wysokości {0}.
Wymagane jest konto „{1}”, aby zaksięgować te wartości. Proszę ustawić to w firmie: {2}.
Alternatywnie, można włączyć opcję „{3}”, aby nie księgować żadnej korekty zaokrąglenia."
@@ -33729,7 +33799,7 @@ msgstr "Koszty operacyjne (Spółka waluty)"
msgid "Operating Cost Per BOM Quantity"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr ""
@@ -33885,7 +33955,7 @@ msgstr ""
msgid "Operations Routing"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr ""
@@ -34477,7 +34547,7 @@ msgstr "Dopuszczalne przekroczenie dostawy/przyjęcia (%)"
msgid "Over Picking Allowance"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr ""
@@ -34929,7 +34999,7 @@ msgstr ""
msgid "Packed Items"
msgstr "Przedmioty pakowane"
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr ""
@@ -34964,7 +35034,7 @@ msgstr ""
msgid "Packing Slip Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr ""
@@ -35050,7 +35120,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35325,7 +35395,7 @@ msgstr ""
msgid "Partial Payment in POS Transactions are not allowed."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr ""
@@ -35519,9 +35589,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35682,9 +35752,9 @@ 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35849,7 +35919,7 @@ msgstr "Ustawienia płatnik"
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -35985,7 +36055,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr ""
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr ""
@@ -36194,7 +36264,7 @@ msgstr "Odniesienia płatności"
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36220,11 +36290,11 @@ msgstr ""
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr ""
@@ -36382,7 +36452,7 @@ msgstr ""
msgid "Payment Unlink Error"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr ""
@@ -36703,7 +36773,7 @@ msgstr ""
msgid "Period Based On"
msgstr ""
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr ""
@@ -37306,7 +37376,7 @@ msgstr ""
msgid "Please add {1} role to user {0}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr ""
@@ -37314,7 +37384,7 @@ msgstr ""
msgid "Please attach CSV file"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr ""
@@ -37327,7 +37397,7 @@ msgstr ""
msgid "Please cancel related transaction."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr "Proszę sprawdzić opcję Multi Currency, aby umożliwić konta w innej walucie"
@@ -37404,7 +37474,7 @@ msgstr ""
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr ""
@@ -37528,7 +37598,7 @@ msgstr ""
msgid "Please enter Receipt Document"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr ""
@@ -37653,8 +37723,8 @@ msgstr ""
msgid "Please mention 'Weight UOM' along with Weight."
msgstr ""
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr ""
@@ -37782,7 +37852,7 @@ msgstr ""
msgid "Please select Posting Date first"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr ""
@@ -37814,7 +37884,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr ""
@@ -37904,6 +37974,10 @@ 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
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr ""
@@ -37912,7 +37986,7 @@ msgstr ""
msgid "Please select atleast one operation to create Job Card"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr ""
@@ -37993,15 +38067,15 @@ msgstr ""
msgid "Please set 'Apply Additional Discount On'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr ""
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr ""
@@ -38009,7 +38083,7 @@ msgstr ""
msgid "Please set Account"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr ""
@@ -38035,7 +38109,7 @@ msgstr ""
msgid "Please set Company"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr ""
@@ -38053,7 +38127,7 @@ msgstr ""
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr ""
@@ -38116,7 +38190,7 @@ msgstr ""
msgid "Please set an Address on the Company '%s'"
msgstr ""
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr ""
@@ -38132,23 +38206,23 @@ msgstr ""
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr ""
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr ""
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr ""
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr ""
@@ -38252,7 +38326,7 @@ msgstr ""
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr ""
@@ -38265,7 +38339,7 @@ msgid "Please specify Company"
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr ""
@@ -38438,6 +38512,7 @@ msgstr ""
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38472,11 +38547,11 @@ 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38495,6 +38570,7 @@ msgstr ""
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38504,6 +38580,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_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
@@ -39069,6 +39146,14 @@ msgstr ""
msgid "Pricing Rule Item Group"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr ""
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr ""
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr ""
@@ -39127,6 +39212,10 @@ msgstr ""
msgid "Pricing Rules"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr ""
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39514,7 +39603,7 @@ msgstr ""
msgid "Process Loss"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr ""
@@ -40004,7 +40093,7 @@ msgstr "Postęp (%)"
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40479,7 +40568,7 @@ msgstr ""
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr ""
@@ -40635,7 +40724,7 @@ msgstr ""
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40811,9 +40900,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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41694,6 +41783,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/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
@@ -41810,7 +41900,7 @@ msgstr ""
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr "Ilość produktu otrzymanego po produkcji / przepakowaniu z podanych ilości surowców"
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr ""
@@ -42659,7 +42749,7 @@ msgid "Reason"
msgstr ""
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr ""
@@ -43095,7 +43185,7 @@ msgstr "Zrealizuj przeciw"
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr ""
@@ -43227,7 +43317,7 @@ msgstr ""
msgid "Reference"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr ""
@@ -43365,7 +43455,7 @@ msgstr ""
msgid "Reference No"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr ""
@@ -43373,11 +43463,11 @@ msgstr ""
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr ""
@@ -43491,11 +43581,11 @@ msgstr ""
msgid "References"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr ""
@@ -43640,8 +43730,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43660,7 +43750,7 @@ msgstr ""
msgid "Remaining"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr ""
@@ -43673,7 +43763,7 @@ msgstr ""
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr ""
@@ -43722,7 +43812,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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -44033,7 +44123,7 @@ msgstr ""
msgid "Repost Status"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr ""
@@ -44357,7 +44447,7 @@ msgstr "Ponownie wybierz, jeśli wybrany kontakt jest edytowany po zapisaniu"
msgid "Reseller"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr ""
@@ -44826,7 +44916,7 @@ msgstr ""
msgid "Return / Credit Note"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr ""
@@ -45350,12 +45440,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: 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/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr ""
@@ -45501,7 +45591,7 @@ msgstr "Wiersz #{0}: Zduplikowany wpis w referencjach {1} {2}"
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr ""
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr ""
@@ -45525,11 +45615,11 @@ msgstr ""
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr ""
@@ -45549,7 +45639,7 @@ msgstr ""
msgid "Row #{0}: Item {1} does not exist"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr ""
@@ -45585,7 +45675,7 @@ 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:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr ""
@@ -45630,15 +45720,15 @@ msgstr ""
msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}."
msgstr "Wiersz #{0}: Ilość powinna być mniejsza lub równa dostępnej ilości do rezerwacji (rzeczywista ilość - zarezerwowana ilość) {1} dla przedmiotu {2} w partii {3} w magazynie {4}."
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr ""
@@ -45647,7 +45737,7 @@ msgstr ""
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr ""
@@ -45741,19 +45831,19 @@ msgstr ""
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr ""
@@ -45761,8 +45851,8 @@ msgstr ""
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr ""
@@ -45943,7 +46033,7 @@ msgstr "Wiersz {0}# Przedmiot {1} nie znaleziony w tabeli 'Dostarczone surowce'
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr ""
@@ -45951,11 +46041,11 @@ msgstr ""
msgid "Row {0}: Activity Type is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr ""
@@ -45975,7 +46065,7 @@ msgstr ""
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr ""
@@ -45991,7 +46081,7 @@ msgstr ""
msgid "Row {0}: Cost center is required for an item {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr ""
@@ -45999,7 +46089,7 @@ msgstr ""
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr ""
@@ -46015,7 +46105,7 @@ msgstr ""
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr ""
@@ -46049,7 +46139,7 @@ msgstr ""
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46061,7 +46151,7 @@ msgstr ""
msgid "Row {0}: Hours value must be greater than zero."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr ""
@@ -46085,7 +46175,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr ""
@@ -46093,7 +46183,7 @@ msgstr ""
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr ""
@@ -46105,11 +46195,11 @@ msgstr ""
msgid "Row {0}: Payment Term is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr ""
@@ -46177,7 +46267,7 @@ msgstr ""
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46201,7 +46291,7 @@ msgstr ""
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr ""
@@ -46222,7 +46312,7 @@ msgstr ""
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr ""
@@ -46615,7 +46705,7 @@ msgstr ""
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr ""
@@ -46844,7 +46934,7 @@ msgstr ""
msgid "Sales Order Trends"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr ""
@@ -47354,8 +47444,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47628,7 +47718,7 @@ msgstr "Złom koszt materiału (Spółka waluty)"
msgid "Scrap Warehouse"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr ""
@@ -47701,7 +47791,7 @@ msgstr "Sekretarka"
msgid "Section"
msgstr "Sekcja"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr ""
@@ -48071,7 +48161,7 @@ msgstr "Wybierz, aby klient mógł wyszukać za pomocą tych pól"
msgid "Selected POS Opening Entry should be open."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr ""
@@ -48255,7 +48345,7 @@ msgstr ""
msgid "Sender"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr ""
@@ -48379,7 +48469,9 @@ msgstr ""
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48410,7 +48502,9 @@ msgid "Serial No Count"
msgstr ""
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr ""
@@ -48418,7 +48512,7 @@ msgstr ""
msgid "Serial No Range"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr ""
@@ -48458,6 +48552,13 @@ msgstr ""
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr ""
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr ""
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr ""
@@ -48487,7 +48588,7 @@ msgstr ""
msgid "Serial No {0} does not exist"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr ""
@@ -48536,7 +48637,7 @@ msgstr ""
msgid "Serial Nos and Batches"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr ""
@@ -48614,11 +48715,11 @@ msgstr ""
msgid "Serial and Batch Bundle"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr ""
@@ -49052,7 +49153,7 @@ msgstr ""
msgid "Set Loyalty Program"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr ""
@@ -49307,7 +49408,7 @@ msgstr ""
msgid "Setting up company"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49491,7 +49592,7 @@ msgstr ""
msgid "Shipment details"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr ""
@@ -49738,6 +49839,10 @@ msgstr ""
msgid "Show Completed"
msgstr ""
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr ""
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr ""
@@ -49853,7 +49958,7 @@ msgstr ""
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr ""
@@ -50158,13 +50263,27 @@ msgstr ""
msgid "Source DocType"
msgstr "Źródło DocType"
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr ""
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr ""
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr ""
@@ -50235,7 +50354,7 @@ msgstr "Adres hurtowni"
msgid "Source Warehouse Address Link"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr ""
@@ -50746,7 +50865,7 @@ msgstr "Stan / prowincja"
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51089,7 +51208,7 @@ msgstr ""
msgid "Stock Entry {0} has created"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr ""
@@ -51312,13 +51431,13 @@ msgstr ""
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51327,13 +51446,13 @@ msgstr ""
msgid "Stock Reservation"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr ""
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr ""
@@ -51355,7 +51474,7 @@ msgstr ""
msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr ""
@@ -51600,7 +51719,7 @@ msgstr ""
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr ""
@@ -51616,7 +51735,7 @@ 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 "Zapasy nie mogą zostać zaktualizowane, ponieważ faktura zawiera przedmiot dropshippingowy. Wyłącz opcję „Zaktualizuj zapasy” lub usuń przedmiot dropshippingowy."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr ""
@@ -52484,10 +52603,15 @@ 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr ""
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52600,7 +52724,7 @@ msgstr ""
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr ""
@@ -52614,8 +52738,8 @@ 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr ""
@@ -53162,16 +53286,16 @@ msgstr ""
msgid "System will notify to increase or decrease quantity or amount "
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr ""
@@ -53188,7 +53312,7 @@ msgstr ""
msgid "TDS Payable"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr ""
@@ -53744,7 +53868,7 @@ msgstr "Rodzaj podatku"
msgid "Tax Withheld Vouchers"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr ""
@@ -54369,7 +54493,7 @@ msgstr ""
msgid "The BOM which will be replaced"
msgstr "BOM zostanie zastąpiony"
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr ""
@@ -54397,7 +54521,7 @@ msgstr ""
msgid "The Loyalty Program isn't valid for the selected company"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr ""
@@ -54421,7 +54545,7 @@ msgstr ""
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr ""
@@ -54443,7 +54567,7 @@ msgstr ""
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr "Głowica konto ramach odpowiedzialności lub kapitałowe, w których zysk / strata będzie zarezerwowane"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr ""
@@ -54484,7 +54608,7 @@ msgstr ""
msgid "The field To Shareholder cannot be blank"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr ""
@@ -54500,7 +54624,7 @@ msgstr ""
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr ""
@@ -54761,6 +54885,10 @@ msgstr ""
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr ""
@@ -55027,7 +55155,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr "Ten harmonogram został utworzony, gdy Aktywo {0} zostało przywrócone po anulowaniu Kapitału Aktywa {1}."
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr "Ten harmonogram został utworzony, gdy Aktywo {0} zostało przywrócone."
@@ -55035,7 +55163,7 @@ msgstr "Ten harmonogram został utworzony, gdy Aktywo {0} zostało przywrócone.
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr "Ten harmonogram został utworzony, gdy Aktywo {0} zostało zwrócone przez Fakturę Sprzedaży {1}."
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr "Ten harmonogram został utworzony, gdy Aktywo {0} zostało zezłomowane."
@@ -55810,6 +55938,10 @@ msgstr ""
msgid "To merge, following properties must be same for both items"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr ""
@@ -55827,7 +55959,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr ""
@@ -56049,7 +56181,7 @@ msgstr ""
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56211,7 +56343,7 @@ msgstr ""
msgid "Total Debit"
msgstr "Całkowita kwota debetu"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr ""
@@ -56804,6 +56936,10 @@ msgstr ""
msgid "Traceability"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr ""
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56844,7 +56980,7 @@ msgstr ""
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -56942,7 +57078,7 @@ msgstr ""
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr ""
@@ -56964,7 +57100,7 @@ msgstr ""
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57561,7 +57697,11 @@ msgstr ""
msgid "Unassigned Qty"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr ""
@@ -58928,7 +59068,7 @@ msgstr ""
msgid "Vendor Invoices"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr ""
@@ -58995,7 +59135,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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59186,11 +59326,11 @@ msgstr "Nazwa Voucheru"
#: 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59225,7 +59365,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr "Podtyp Voucheru"
@@ -59257,9 +59397,9 @@ msgstr "Podtyp Voucheru"
#: 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59278,6 +59418,7 @@ msgstr "Podtyp Voucheru"
#: 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_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
@@ -59487,6 +59628,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_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
@@ -59595,7 +59737,7 @@ msgstr "Magazyn i punkt odniesienia"
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr ""
@@ -59608,7 +59750,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:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr ""
@@ -59759,7 +59901,7 @@ msgstr ""
msgid "Warning!"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr ""
@@ -60242,6 +60384,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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr ""
@@ -60717,7 +60860,7 @@ msgstr ""
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr ""
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr ""
@@ -60749,7 +60892,7 @@ msgstr ""
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr ""
@@ -60766,7 +60909,7 @@ msgstr ""
msgid "You can only select one mode of payment as default"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr ""
@@ -60798,11 +60941,11 @@ msgstr ""
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr ""
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr ""
@@ -60818,7 +60961,7 @@ msgstr ""
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr ""
@@ -60850,7 +60993,7 @@ msgstr ""
msgid "You don't have enough Loyalty Points to redeem"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr ""
@@ -61276,7 +61419,7 @@ msgstr ""
msgid "to"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr ""
@@ -61316,7 +61459,7 @@ msgstr ""
msgid "{0} '{1}' is disabled"
msgstr ""
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr ""
@@ -61348,7 +61491,7 @@ msgstr ""
msgid "{0} Digest"
msgstr ""
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr ""
@@ -61364,7 +61507,7 @@ msgstr ""
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr ""
@@ -61380,19 +61523,19 @@ msgstr ""
msgid "{0} account not found while submitting purchase receipt"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr ""
@@ -61400,7 +61543,7 @@ msgstr ""
msgid "{0} already has a Parent Procedure {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr ""
@@ -61459,7 +61602,7 @@ msgstr ""
msgid "{0} entered twice {1} in Item Taxes"
msgstr ""
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr ""
@@ -61512,7 +61655,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr ""
@@ -61587,7 +61730,7 @@ msgstr ""
msgid "{0} must be negative in return document"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr ""
@@ -61603,7 +61746,7 @@ msgstr ""
msgid "{0} payment entries can not be filtered by {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr ""
@@ -61664,7 +61807,7 @@ msgstr ""
msgid "{0} {1} Manually"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr ""
@@ -61729,7 +61872,7 @@ msgstr ""
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr ""
@@ -61741,7 +61884,7 @@ msgstr ""
msgid "{0} {1} is frozen"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr ""
@@ -61753,12 +61896,12 @@ msgstr ""
msgid "{0} {1} is not associated with {2} {3}"
msgstr ""
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr ""
@@ -61770,7 +61913,7 @@ msgstr ""
msgid "{0} {1} must be submitted"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr ""
@@ -61805,7 +61948,7 @@ msgstr ""
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr ""
@@ -61883,7 +62026,7 @@ msgstr "{doctype} {name} zostanie anulowane lub zamknięte."
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr ""
@@ -61891,7 +62034,7 @@ msgstr ""
msgid "{ref_doctype} {ref_name} is {status}."
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr ""
@@ -61949,7 +62092,7 @@ msgstr ""
msgid "{} To Bill"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr ""
diff --git a/erpnext/locale/pt.po b/erpnext/locale/pt.po
index a6a36624351..a6a4d4b5717 100644
--- a/erpnext/locale/pt.po
+++ b/erpnext/locale/pt.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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:10\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:06\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Portuguese\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr ""
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr ""
msgid "'Default {0} Account' in Company {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr ""
@@ -840,11 +840,11 @@ msgstr ""
msgid "Your Shortcuts"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr ""
@@ -1215,10 +1215,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1523,7 +1523,7 @@ msgstr ""
msgid "Account {0}: You can not assign itself as parent account"
msgstr ""
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr ""
@@ -2012,7 +2012,7 @@ msgstr ""
msgid "Accounts Manager"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr ""
@@ -2199,7 +2199,7 @@ msgstr ""
msgid "Accounts User"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr ""
@@ -2559,6 +2559,10 @@ msgstr ""
msgid "Actual Expense"
msgstr ""
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr ""
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2696,7 +2700,7 @@ msgstr ""
msgid "Add Child"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr ""
@@ -3502,7 +3506,7 @@ msgstr ""
msgid "Advance amount cannot be greater than {0} {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr ""
@@ -3559,7 +3563,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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr ""
@@ -3628,7 +3632,7 @@ msgstr ""
msgid "Against Income Account"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr ""
@@ -3676,7 +3680,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr ""
@@ -3688,7 +3692,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr ""
@@ -3700,8 +3704,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr ""
@@ -3827,7 +3831,7 @@ msgstr "Todos"
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr ""
@@ -3995,7 +3999,7 @@ msgstr ""
msgid "All items have already been Invoiced/Returned"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr ""
@@ -4021,7 +4025,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:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr ""
@@ -4907,7 +4911,7 @@ msgstr ""
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5047,7 +5051,7 @@ msgstr ""
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr ""
@@ -5198,7 +5202,7 @@ msgstr ""
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr ""
@@ -5781,7 +5785,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5823,7 +5827,7 @@ msgstr ""
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr ""
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr ""
@@ -5862,7 +5866,7 @@ msgstr ""
msgid "Asset Finance Book"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr ""
@@ -5938,7 +5942,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr ""
@@ -6024,9 +6028,9 @@ msgstr ""
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr ""
@@ -6055,7 +6059,7 @@ msgstr ""
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr ""
@@ -6087,7 +6091,7 @@ msgstr ""
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr ""
@@ -6099,11 +6103,11 @@ msgstr ""
msgid "Asset returned"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr ""
@@ -6128,7 +6132,7 @@ msgstr ""
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr ""
@@ -6161,7 +6165,15 @@ msgstr ""
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr ""
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr ""
@@ -6542,7 +6554,7 @@ msgstr ""
msgid "Auto Reconcile Payments"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr ""
@@ -6552,7 +6564,7 @@ msgstr ""
msgid "Auto Reconciliation Job Trigger"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr ""
@@ -6727,7 +6739,7 @@ msgstr ""
msgid "Available Batch Report"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr ""
@@ -6956,7 +6968,7 @@ msgstr ""
msgid "BOM 1"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr ""
@@ -7194,23 +7206,23 @@ msgstr ""
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr ""
@@ -7281,7 +7293,7 @@ msgstr ""
msgid "Balance (Dr - Cr)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr ""
@@ -7760,7 +7772,7 @@ msgstr ""
msgid "Base Tax Withholding Net Total"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr ""
@@ -7965,7 +7977,9 @@ msgstr ""
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -7976,7 +7990,7 @@ msgstr ""
msgid "Batch No is mandatory"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr ""
@@ -7999,7 +8013,7 @@ msgstr ""
msgid "Batch Nos"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr ""
@@ -8012,7 +8026,7 @@ msgstr ""
msgid "Batch Number Series"
msgstr ""
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr ""
@@ -8125,7 +8139,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8438,8 +8452,8 @@ msgstr ""
msgid "Blanket Order Rate"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr ""
@@ -8555,7 +8569,7 @@ msgstr ""
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr ""
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr ""
@@ -9329,7 +9343,7 @@ msgstr ""
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr ""
@@ -9515,7 +9529,7 @@ msgstr ""
msgid "Cannot Relieve Employee"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr ""
@@ -9531,6 +9545,10 @@ msgstr ""
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr ""
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr ""
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr ""
@@ -9620,7 +9638,7 @@ msgstr ""
msgid "Cannot create root account."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr ""
@@ -9637,7 +9655,7 @@ msgstr ""
msgid "Cannot delete Exchange Gain/Loss row"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr ""
@@ -10083,11 +10101,11 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr ""
@@ -10100,7 +10118,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr ""
@@ -10908,6 +10926,7 @@ msgstr ""
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11055,6 +11074,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11140,8 +11160,8 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11457,7 +11477,7 @@ msgstr ""
msgid "Company and Posting Date is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr ""
@@ -12738,7 +12758,7 @@ 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12757,7 +12777,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -12970,7 +12990,7 @@ msgstr ""
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr ""
@@ -13093,15 +13113,15 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13343,7 +13363,7 @@ msgstr ""
msgid "Create POS Opening Entry"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr ""
@@ -13499,7 +13519,7 @@ msgstr ""
msgid "Creating Delivery Note ..."
msgstr ""
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr ""
@@ -13519,7 +13539,7 @@ msgstr ""
msgid "Creating Purchase Order ..."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13556,11 +13576,6 @@ msgstr ""
msgid "Creation"
msgstr ""
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr ""
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr ""
@@ -13593,11 +13608,11 @@ msgstr ""
msgid "Credit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr ""
@@ -13740,7 +13755,7 @@ 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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr ""
@@ -13948,7 +13963,7 @@ msgstr ""
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14047,7 +14062,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr ""
@@ -14397,6 +14412,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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14424,6 +14440,10 @@ msgstr ""
msgid "Customer / Lead Address"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr ""
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14825,7 +14845,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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr ""
@@ -15177,7 +15197,7 @@ msgstr ""
msgid "Date of Joining"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr ""
@@ -15314,11 +15334,11 @@ msgstr ""
msgid "Debit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr ""
@@ -15392,7 +15412,7 @@ msgstr ""
msgid "Debit To is required"
msgstr ""
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr ""
@@ -16459,7 +16479,7 @@ msgstr ""
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16534,9 +16554,9 @@ msgstr ""
msgid "Depreciate based on shifts"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr ""
@@ -16592,6 +16612,14 @@ msgstr ""
msgid "Depreciation Entry Posting Status"
msgstr ""
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr ""
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16600,7 +16628,7 @@ msgstr ""
msgid "Depreciation Expense Account"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr ""
@@ -17486,6 +17514,10 @@ msgstr ""
msgid "Discount Percentage"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr ""
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr ""
@@ -17718,7 +17750,7 @@ msgstr ""
msgid "Disposal Date"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr ""
@@ -17998,7 +18030,7 @@ msgstr ""
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr ""
@@ -19037,7 +19069,7 @@ msgstr "Vazio"
msgid "Ems(Pica)"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr ""
@@ -19388,7 +19420,7 @@ msgstr ""
msgid "Enter a name for this Holiday List."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr ""
@@ -19449,7 +19481,7 @@ msgstr ""
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr ""
@@ -19469,7 +19501,7 @@ msgid "Entity"
msgstr ""
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19564,7 +19596,7 @@ msgstr ""
msgid "Error in party matching for Bank Transaction {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr ""
@@ -19614,10 +19646,8 @@ msgstr ""
msgid "Evaluation Period"
msgstr ""
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
msgstr ""
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
@@ -19979,7 +20009,7 @@ msgstr ""
msgid "Expense"
msgstr ""
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr ""
@@ -20024,7 +20054,7 @@ msgstr ""
msgid "Expense Account"
msgstr ""
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr ""
@@ -20331,7 +20361,7 @@ msgstr ""
msgid "Failure Description"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr ""
@@ -21007,6 +21037,10 @@ msgstr ""
msgid "Fixed Asset Register"
msgstr ""
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21137,7 +21171,7 @@ msgstr ""
msgid "For Item"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr ""
@@ -22029,7 +22063,7 @@ msgstr ""
msgid "Future Payments"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr ""
@@ -22045,7 +22079,7 @@ msgstr ""
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr ""
@@ -22311,8 +22345,8 @@ msgid "Get Items"
msgstr ""
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22671,7 +22705,7 @@ msgstr ""
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22681,7 +22715,7 @@ msgstr ""
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22802,8 +22836,8 @@ msgstr ""
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr ""
@@ -23154,7 +23188,7 @@ msgstr ""
msgid "Height (cm)"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr ""
@@ -23193,7 +23227,7 @@ msgstr ""
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr ""
@@ -23289,7 +23323,7 @@ msgstr ""
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr ""
@@ -23383,6 +23417,10 @@ msgstr ""
msgid "Hours Spent"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr ""
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23719,6 +23757,10 @@ msgstr ""
msgid "If more than one package of the same type (for print)"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr ""
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23735,6 +23777,10 @@ msgstr ""
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr ""
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23817,6 +23863,10 @@ msgstr ""
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr ""
@@ -23911,7 +23961,7 @@ msgstr ""
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -23963,7 +24013,7 @@ msgstr ""
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr ""
@@ -24726,7 +24776,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24799,7 +24849,7 @@ msgstr ""
msgid "Incorrect Stock Value Report"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr ""
@@ -24966,13 +25016,13 @@ msgstr ""
msgid "Inspected By"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr ""
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr ""
@@ -24989,7 +25039,7 @@ msgstr ""
msgid "Inspection Required before Purchase"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr ""
@@ -25019,7 +25069,7 @@ msgstr ""
msgid "Installation Note Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr ""
@@ -25077,7 +25127,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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr ""
@@ -25268,7 +25318,7 @@ msgstr ""
msgid "Internal Work History"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr ""
@@ -25304,7 +25354,7 @@ msgid "Invalid Account"
msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr ""
@@ -25332,7 +25382,7 @@ msgstr ""
msgid "Invalid Child Procedure"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr ""
@@ -25390,7 +25440,7 @@ msgid "Invalid Ledger Entries"
msgstr ""
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr ""
@@ -25418,7 +25468,7 @@ msgstr ""
msgid "Invalid Priority"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr ""
@@ -25502,8 +25552,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr ""
@@ -25511,7 +25561,7 @@ msgstr ""
msgid "Invalid {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr ""
@@ -25721,7 +25771,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26773,6 +26823,8 @@ msgstr ""
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26791,7 +26843,11 @@ msgstr ""
msgid "Item Code (Final Product)"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr ""
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr ""
@@ -27195,6 +27251,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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28115,7 +28172,7 @@ msgstr ""
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr ""
@@ -28321,7 +28378,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29037,7 +29094,7 @@ msgstr ""
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29708,7 +29765,7 @@ msgstr ""
msgid "Mandatory Depends On"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr ""
@@ -29798,6 +29855,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30356,6 +30414,7 @@ msgid "Material Requested"
msgstr ""
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr ""
@@ -30711,7 +30770,7 @@ msgstr ""
msgid "Message Examples"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr ""
@@ -31025,8 +31084,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr ""
@@ -31044,6 +31103,10 @@ msgstr ""
msgid "Missing Default in Company"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr ""
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr ""
@@ -31076,7 +31139,7 @@ msgstr ""
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr ""
@@ -31742,7 +31805,7 @@ msgstr ""
msgid "Needs Analysis"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr ""
@@ -32174,7 +32237,7 @@ msgstr ""
msgid "New Sales Person Name"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr ""
@@ -32210,7 +32273,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:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr ""
@@ -32319,7 +32382,7 @@ msgstr ""
msgid "No Answer"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr ""
@@ -32376,9 +32439,9 @@ msgstr ""
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr ""
@@ -32413,7 +32476,7 @@ msgstr ""
msgid "No Summary"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr ""
@@ -32511,7 +32574,7 @@ msgstr ""
msgid "No items to be received are overdue"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr ""
@@ -32645,11 +32708,11 @@ msgstr ""
msgid "No values"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr ""
@@ -32684,7 +32747,7 @@ msgstr ""
msgid "Non Profit"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr ""
@@ -32863,7 +32926,7 @@ msgstr ""
msgid "Note: Email will not be sent to disabled users"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr ""
@@ -32883,7 +32946,7 @@ msgstr ""
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr ""
@@ -32899,6 +32962,7 @@ msgstr ""
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33334,6 +33398,12 @@ msgstr ""
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr ""
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr ""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33535,8 +33605,8 @@ msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr ""
@@ -33578,7 +33648,7 @@ msgstr ""
msgid "Opening Entry"
msgstr ""
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr ""
@@ -33606,7 +33676,7 @@ msgid "Opening Invoice Item"
msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 ""
@@ -33680,7 +33750,7 @@ msgstr ""
msgid "Operating Cost Per BOM Quantity"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr ""
@@ -33836,7 +33906,7 @@ msgstr ""
msgid "Operations Routing"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr ""
@@ -34428,7 +34498,7 @@ msgstr ""
msgid "Over Picking Allowance"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr ""
@@ -34880,7 +34950,7 @@ msgstr ""
msgid "Packed Items"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr ""
@@ -34915,7 +34985,7 @@ msgstr ""
msgid "Packing Slip Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr ""
@@ -35001,7 +35071,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35276,7 +35346,7 @@ msgstr ""
msgid "Partial Payment in POS Transactions are not allowed."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr ""
@@ -35470,9 +35540,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35633,9 +35703,9 @@ 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35800,7 +35870,7 @@ msgstr ""
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -35936,7 +36006,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr ""
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr ""
@@ -36145,7 +36215,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36171,11 +36241,11 @@ msgstr ""
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr ""
@@ -36333,7 +36403,7 @@ msgstr ""
msgid "Payment Unlink Error"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr ""
@@ -36654,7 +36724,7 @@ msgstr ""
msgid "Period Based On"
msgstr ""
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr ""
@@ -37257,7 +37327,7 @@ msgstr ""
msgid "Please add {1} role to user {0}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr ""
@@ -37265,7 +37335,7 @@ msgstr ""
msgid "Please attach CSV file"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr ""
@@ -37278,7 +37348,7 @@ msgstr ""
msgid "Please cancel related transaction."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr ""
@@ -37355,7 +37425,7 @@ msgstr ""
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr ""
@@ -37479,7 +37549,7 @@ msgstr ""
msgid "Please enter Receipt Document"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr ""
@@ -37604,8 +37674,8 @@ msgstr ""
msgid "Please mention 'Weight UOM' along with Weight."
msgstr ""
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr ""
@@ -37733,7 +37803,7 @@ msgstr ""
msgid "Please select Posting Date first"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr ""
@@ -37765,7 +37835,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr ""
@@ -37855,6 +37925,10 @@ 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
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr ""
@@ -37863,7 +37937,7 @@ msgstr ""
msgid "Please select atleast one operation to create Job Card"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr ""
@@ -37944,15 +38018,15 @@ msgstr ""
msgid "Please set 'Apply Additional Discount On'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr ""
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr ""
@@ -37960,7 +38034,7 @@ msgstr ""
msgid "Please set Account"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr ""
@@ -37986,7 +38060,7 @@ msgstr ""
msgid "Please set Company"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr ""
@@ -38004,7 +38078,7 @@ msgstr ""
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr ""
@@ -38067,7 +38141,7 @@ msgstr ""
msgid "Please set an Address on the Company '%s'"
msgstr ""
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr ""
@@ -38083,23 +38157,23 @@ msgstr ""
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr ""
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr ""
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr ""
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr ""
@@ -38203,7 +38277,7 @@ msgstr ""
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr ""
@@ -38216,7 +38290,7 @@ msgid "Please specify Company"
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr ""
@@ -38389,6 +38463,7 @@ msgstr ""
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38423,11 +38498,11 @@ 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38446,6 +38521,7 @@ msgstr ""
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38455,6 +38531,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_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
@@ -39020,6 +39097,14 @@ msgstr ""
msgid "Pricing Rule Item Group"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr ""
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr ""
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr ""
@@ -39078,6 +39163,10 @@ msgstr ""
msgid "Pricing Rules"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr ""
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39465,7 +39554,7 @@ msgstr ""
msgid "Process Loss"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr ""
@@ -39955,7 +40044,7 @@ msgstr ""
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40430,7 +40519,7 @@ msgstr ""
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr ""
@@ -40586,7 +40675,7 @@ msgstr ""
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40762,9 +40851,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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41645,6 +41734,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/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
@@ -41761,7 +41851,7 @@ msgstr ""
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr ""
@@ -42610,7 +42700,7 @@ msgid "Reason"
msgstr ""
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr ""
@@ -43046,7 +43136,7 @@ msgstr ""
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr ""
@@ -43178,7 +43268,7 @@ msgstr ""
msgid "Reference"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr ""
@@ -43316,7 +43406,7 @@ msgstr ""
msgid "Reference No"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr ""
@@ -43324,11 +43414,11 @@ msgstr ""
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr ""
@@ -43442,11 +43532,11 @@ msgstr ""
msgid "References"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr ""
@@ -43591,8 +43681,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43611,7 +43701,7 @@ msgstr ""
msgid "Remaining"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr ""
@@ -43624,7 +43714,7 @@ msgstr ""
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr ""
@@ -43673,7 +43763,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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -43984,7 +44074,7 @@ msgstr ""
msgid "Repost Status"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr ""
@@ -44308,7 +44398,7 @@ msgstr ""
msgid "Reseller"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr ""
@@ -44777,7 +44867,7 @@ msgstr ""
msgid "Return / Credit Note"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr ""
@@ -45301,12 +45391,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: 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/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr ""
@@ -45452,7 +45542,7 @@ msgstr ""
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr ""
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr ""
@@ -45476,11 +45566,11 @@ msgstr ""
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr ""
@@ -45500,7 +45590,7 @@ msgstr ""
msgid "Row #{0}: Item {1} does not exist"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr ""
@@ -45536,7 +45626,7 @@ 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:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr ""
@@ -45581,15 +45671,15 @@ msgstr ""
msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr ""
@@ -45598,7 +45688,7 @@ msgstr ""
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr ""
@@ -45692,19 +45782,19 @@ msgstr ""
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr ""
@@ -45712,8 +45802,8 @@ msgstr ""
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr ""
@@ -45894,7 +45984,7 @@ msgstr ""
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr ""
@@ -45902,11 +45992,11 @@ msgstr ""
msgid "Row {0}: Activity Type is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr ""
@@ -45926,7 +46016,7 @@ msgstr ""
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr ""
@@ -45942,7 +46032,7 @@ msgstr ""
msgid "Row {0}: Cost center is required for an item {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr ""
@@ -45950,7 +46040,7 @@ msgstr ""
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr ""
@@ -45966,7 +46056,7 @@ msgstr ""
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr ""
@@ -46000,7 +46090,7 @@ msgstr ""
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46012,7 +46102,7 @@ msgstr ""
msgid "Row {0}: Hours value must be greater than zero."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr ""
@@ -46036,7 +46126,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr ""
@@ -46044,7 +46134,7 @@ msgstr ""
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr ""
@@ -46056,11 +46146,11 @@ msgstr ""
msgid "Row {0}: Payment Term is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr ""
@@ -46128,7 +46218,7 @@ msgstr ""
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46152,7 +46242,7 @@ msgstr ""
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr ""
@@ -46173,7 +46263,7 @@ msgstr ""
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr ""
@@ -46566,7 +46656,7 @@ msgstr ""
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr ""
@@ -46795,7 +46885,7 @@ msgstr ""
msgid "Sales Order Trends"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr ""
@@ -47305,8 +47395,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47577,7 +47667,7 @@ msgstr ""
msgid "Scrap Warehouse"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr ""
@@ -47650,7 +47740,7 @@ msgstr ""
msgid "Section"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr ""
@@ -48020,7 +48110,7 @@ msgstr ""
msgid "Selected POS Opening Entry should be open."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr ""
@@ -48204,7 +48294,7 @@ msgstr ""
msgid "Sender"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr ""
@@ -48328,7 +48418,9 @@ msgstr ""
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48359,7 +48451,9 @@ msgid "Serial No Count"
msgstr ""
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr ""
@@ -48367,7 +48461,7 @@ msgstr ""
msgid "Serial No Range"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr ""
@@ -48407,6 +48501,13 @@ msgstr ""
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr ""
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr ""
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr ""
@@ -48436,7 +48537,7 @@ msgstr ""
msgid "Serial No {0} does not exist"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr ""
@@ -48485,7 +48586,7 @@ msgstr ""
msgid "Serial Nos and Batches"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr ""
@@ -48563,11 +48664,11 @@ msgstr ""
msgid "Serial and Batch Bundle"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr ""
@@ -49001,7 +49102,7 @@ msgstr ""
msgid "Set Loyalty Program"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr ""
@@ -49256,7 +49357,7 @@ msgstr ""
msgid "Setting up company"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49440,7 +49541,7 @@ msgstr ""
msgid "Shipment details"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr ""
@@ -49687,6 +49788,10 @@ msgstr ""
msgid "Show Completed"
msgstr ""
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr ""
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr ""
@@ -49802,7 +49907,7 @@ msgstr ""
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr ""
@@ -50107,13 +50212,27 @@ msgstr "Fonte"
msgid "Source DocType"
msgstr ""
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr ""
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr ""
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr ""
@@ -50184,7 +50303,7 @@ msgstr ""
msgid "Source Warehouse Address Link"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr ""
@@ -50695,7 +50814,7 @@ msgstr ""
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51038,7 +51157,7 @@ msgstr ""
msgid "Stock Entry {0} has created"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr ""
@@ -51261,13 +51380,13 @@ msgstr ""
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51276,13 +51395,13 @@ msgstr ""
msgid "Stock Reservation"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr ""
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr ""
@@ -51304,7 +51423,7 @@ msgstr ""
msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr ""
@@ -51549,7 +51668,7 @@ msgstr ""
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr ""
@@ -51565,7 +51684,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr ""
@@ -52433,10 +52552,15 @@ 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr ""
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52549,7 +52673,7 @@ msgstr ""
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr ""
@@ -52563,8 +52687,8 @@ 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr ""
@@ -53111,16 +53235,16 @@ msgstr ""
msgid "System will notify to increase or decrease quantity or amount "
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr ""
@@ -53137,7 +53261,7 @@ msgstr ""
msgid "TDS Payable"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr ""
@@ -53693,7 +53817,7 @@ msgstr ""
msgid "Tax Withheld Vouchers"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr ""
@@ -54318,7 +54442,7 @@ msgstr ""
msgid "The BOM which will be replaced"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr ""
@@ -54346,7 +54470,7 @@ msgstr ""
msgid "The Loyalty Program isn't valid for the selected company"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr ""
@@ -54370,7 +54494,7 @@ msgstr ""
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr ""
@@ -54392,7 +54516,7 @@ msgstr ""
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr ""
@@ -54433,7 +54557,7 @@ msgstr ""
msgid "The field To Shareholder cannot be blank"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr ""
@@ -54449,7 +54573,7 @@ msgstr ""
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr ""
@@ -54710,6 +54834,10 @@ msgstr ""
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr ""
@@ -54976,7 +55104,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr ""
@@ -54984,7 +55112,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr ""
@@ -55759,6 +55887,10 @@ msgstr ""
msgid "To merge, following properties must be same for both items"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr ""
@@ -55776,7 +55908,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr ""
@@ -55998,7 +56130,7 @@ msgstr ""
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56160,7 +56292,7 @@ msgstr ""
msgid "Total Debit"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr ""
@@ -56753,6 +56885,10 @@ msgstr ""
msgid "Traceability"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr ""
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56793,7 +56929,7 @@ msgstr ""
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -56891,7 +57027,7 @@ msgstr ""
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr ""
@@ -56913,7 +57049,7 @@ msgstr ""
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57510,7 +57646,11 @@ msgstr ""
msgid "Unassigned Qty"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr ""
@@ -58877,7 +59017,7 @@ msgstr ""
msgid "Vendor Invoices"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr ""
@@ -58944,7 +59084,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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59135,11 +59275,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59174,7 +59314,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr ""
@@ -59206,9 +59346,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59227,6 +59367,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_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
@@ -59436,6 +59577,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_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
@@ -59544,7 +59686,7 @@ msgstr ""
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr ""
@@ -59557,7 +59699,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:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr ""
@@ -59708,7 +59850,7 @@ msgstr ""
msgid "Warning!"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr ""
@@ -60191,6 +60333,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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr ""
@@ -60666,7 +60809,7 @@ msgstr ""
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr ""
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr ""
@@ -60698,7 +60841,7 @@ msgstr ""
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr ""
@@ -60715,7 +60858,7 @@ msgstr ""
msgid "You can only select one mode of payment as default"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr ""
@@ -60747,11 +60890,11 @@ msgstr ""
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr ""
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr ""
@@ -60767,7 +60910,7 @@ msgstr ""
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr ""
@@ -60799,7 +60942,7 @@ msgstr ""
msgid "You don't have enough Loyalty Points to redeem"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr ""
@@ -61225,7 +61368,7 @@ msgstr ""
msgid "to"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr ""
@@ -61265,7 +61408,7 @@ msgstr ""
msgid "{0} '{1}' is disabled"
msgstr ""
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr ""
@@ -61297,7 +61440,7 @@ msgstr ""
msgid "{0} Digest"
msgstr ""
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr ""
@@ -61313,7 +61456,7 @@ msgstr ""
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr ""
@@ -61329,19 +61472,19 @@ msgstr ""
msgid "{0} account not found while submitting purchase receipt"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr ""
@@ -61349,7 +61492,7 @@ msgstr ""
msgid "{0} already has a Parent Procedure {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr ""
@@ -61408,7 +61551,7 @@ msgstr ""
msgid "{0} entered twice {1} in Item Taxes"
msgstr ""
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr ""
@@ -61461,7 +61604,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr ""
@@ -61536,7 +61679,7 @@ msgstr ""
msgid "{0} must be negative in return document"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr ""
@@ -61552,7 +61695,7 @@ msgstr ""
msgid "{0} payment entries can not be filtered by {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr ""
@@ -61613,7 +61756,7 @@ msgstr ""
msgid "{0} {1} Manually"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr ""
@@ -61678,7 +61821,7 @@ msgstr ""
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr ""
@@ -61690,7 +61833,7 @@ msgstr ""
msgid "{0} {1} is frozen"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr ""
@@ -61702,12 +61845,12 @@ msgstr ""
msgid "{0} {1} is not associated with {2} {3}"
msgstr ""
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr ""
@@ -61719,7 +61862,7 @@ msgstr ""
msgid "{0} {1} must be submitted"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr ""
@@ -61754,7 +61897,7 @@ msgstr ""
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr ""
@@ -61832,7 +61975,7 @@ msgstr ""
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr ""
@@ -61840,7 +61983,7 @@ msgstr ""
msgid "{ref_doctype} {ref_name} is {status}."
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr ""
@@ -61898,7 +62041,7 @@ msgstr ""
msgid "{} To Bill"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr ""
diff --git a/erpnext/locale/pt_BR.po b/erpnext/locale/pt_BR.po
index 444c02ce590..8d8f7ca6d01 100644
--- a/erpnext/locale/pt_BR.po
+++ b/erpnext/locale/pt_BR.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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:10\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:06\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Portuguese, Brazilian\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr ""
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr "'Dias desde a última Ordem' deve ser maior ou igual a zero"
msgid "'Default {0} Account' in Company {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr "'Entradas' não pode estar vazio"
@@ -840,11 +840,11 @@ msgstr ""
msgid "Your Shortcuts"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr ""
@@ -1215,10 +1215,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1523,7 +1523,7 @@ msgstr "Conta {0}: a Conta Superior {1} não existe"
msgid "Account {0}: You can not assign itself as parent account"
msgstr ""
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr "Conta: {0} é capital em andamento e não pode ser atualizado pela entrada de diário"
@@ -2012,7 +2012,7 @@ msgstr ""
msgid "Accounts Manager"
msgstr "Gerente de Contas"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr ""
@@ -2199,7 +2199,7 @@ msgstr "Configurações de Contas"
msgid "Accounts User"
msgstr "Usuário de Contas"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr "Tabela de Contas não pode estar vazia."
@@ -2559,6 +2559,10 @@ msgstr ""
msgid "Actual Expense"
msgstr ""
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr ""
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2696,7 +2700,7 @@ msgstr "Adicionar / Editar Preços"
msgid "Add Child"
msgstr "Adicionar Sub-item"
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr ""
@@ -3502,7 +3506,7 @@ msgstr ""
msgid "Advance amount cannot be greater than {0} {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr ""
@@ -3559,7 +3563,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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr "Contra À Conta"
@@ -3628,7 +3632,7 @@ msgstr ""
msgid "Against Income Account"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr ""
@@ -3676,7 +3680,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr "Contra o Comprovante"
@@ -3688,7 +3692,7 @@ msgstr "Contra o Comprovante"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr ""
@@ -3700,8 +3704,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr ""
@@ -3827,7 +3831,7 @@ msgstr "Todos"
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr "Todas as Contas"
@@ -3995,7 +3999,7 @@ msgstr ""
msgid "All items have already been Invoiced/Returned"
msgstr "Todos os itens já foram faturados / devolvidos"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr ""
@@ -4021,7 +4025,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:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr "Todos esses itens já foram faturados / devolvidos"
@@ -4907,7 +4911,7 @@ msgstr ""
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5047,7 +5051,7 @@ msgstr ""
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr ""
@@ -5198,7 +5202,7 @@ msgstr "Outro registro de orçamento ';{0}'; já existe contra {1} ';{2}'; e con
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr ""
@@ -5781,7 +5785,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5823,7 +5827,7 @@ msgstr ""
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr ""
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr ""
@@ -5862,7 +5866,7 @@ msgstr ""
msgid "Asset Finance Book"
msgstr "Livro Contábil de Ativos"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr ""
@@ -5938,7 +5942,7 @@ msgstr "Registro de Movimentação de Ativos {0} criado"
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr "Nome do Ativo"
@@ -6024,9 +6028,9 @@ msgstr ""
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr "Valor Patrimonial"
@@ -6055,7 +6059,7 @@ msgstr ""
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr ""
@@ -6087,7 +6091,7 @@ msgstr ""
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr ""
@@ -6099,11 +6103,11 @@ msgstr ""
msgid "Asset returned"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr "Ativo excluído através do Lançamento Contabilístico {0}"
@@ -6128,7 +6132,7 @@ msgstr ""
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr ""
@@ -6161,7 +6165,15 @@ msgstr ""
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr ""
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr "O Ativo {0} deve ser enviado"
@@ -6542,7 +6554,7 @@ msgstr ""
msgid "Auto Reconcile Payments"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr ""
@@ -6552,7 +6564,7 @@ msgstr ""
msgid "Auto Reconciliation Job Trigger"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr ""
@@ -6727,7 +6739,7 @@ msgstr ""
msgid "Available Batch Report"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr "Data de Uso Disponível"
@@ -6956,7 +6968,7 @@ msgstr "LDM"
msgid "BOM 1"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "BOM 1 {0} e BOM 2 {1} não devem ser iguais"
@@ -7194,23 +7206,23 @@ msgstr ""
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr "A LDM {0} não pertencem ao Item {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr "LDM {0} deve ser ativa"
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr "LDM {0} deve ser enviada"
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr ""
@@ -7281,7 +7293,7 @@ msgstr "Balanço"
msgid "Balance (Dr - Cr)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr "Equilíbrio ({0})"
@@ -7760,7 +7772,7 @@ msgstr ""
msgid "Base Tax Withholding Net Total"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr ""
@@ -7965,7 +7977,9 @@ msgstr ""
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -7976,7 +7990,7 @@ msgstr ""
msgid "Batch No is mandatory"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr ""
@@ -7999,7 +8013,7 @@ msgstr ""
msgid "Batch Nos"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr ""
@@ -8012,7 +8026,7 @@ msgstr ""
msgid "Batch Number Series"
msgstr ""
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr ""
@@ -8125,7 +8139,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8438,8 +8452,8 @@ msgstr ""
msgid "Blanket Order Rate"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr "Bloquear Fatura"
@@ -8555,7 +8569,7 @@ msgstr ""
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr ""
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr ""
@@ -9329,7 +9343,7 @@ msgstr "Não é possível filtrar com base na forma de pagamento, se agrupado po
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr "Só pode fazer o pagamento contra a faturar {0}"
@@ -9515,7 +9529,7 @@ msgstr ""
msgid "Cannot Relieve Employee"
msgstr "Não Pode Dispensar o Funcionário"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr ""
@@ -9531,6 +9545,10 @@ msgstr ""
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr ""
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr ""
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr ""
@@ -9620,7 +9638,7 @@ msgstr ""
msgid "Cannot create root account."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr ""
@@ -9637,7 +9655,7 @@ msgstr ""
msgid "Cannot delete Exchange Gain/Loss row"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr "Não é possível excluir Serial no {0}, como ele é usado em transações de ações"
@@ -10083,11 +10101,11 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr "Alterar Data de Liberação"
@@ -10100,7 +10118,7 @@ msgstr "Alterar Data de Liberação"
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr ""
@@ -10908,6 +10926,7 @@ msgstr ""
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11055,6 +11074,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11140,8 +11160,8 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11457,7 +11477,7 @@ msgstr ""
msgid "Company and Posting Date is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr "As moedas da empresa de ambas as empresas devem corresponder às transações da empresa."
@@ -12738,7 +12758,7 @@ 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12757,7 +12777,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -12970,7 +12990,7 @@ msgstr ""
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr ""
@@ -13093,15 +13113,15 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13343,7 +13363,7 @@ msgstr ""
msgid "Create POS Opening Entry"
msgstr "Criar Entrada de Abertura de PDV"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr "Criar Entrada de Pagamento"
@@ -13499,7 +13519,7 @@ msgstr "Criando Contas..."
msgid "Creating Delivery Note ..."
msgstr ""
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr "Criando Dimensões..."
@@ -13519,7 +13539,7 @@ msgstr ""
msgid "Creating Purchase Order ..."
msgstr "Criando Pedido de Compra..."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13556,11 +13576,6 @@ msgstr ""
msgid "Creation"
msgstr ""
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr ""
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr ""
@@ -13593,11 +13608,11 @@ msgstr ""
msgid "Credit"
msgstr "Crédito"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr "Crédito ({0})"
@@ -13740,7 +13755,7 @@ msgstr "Nota de Crédito Emitida"
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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr "A nota de crédito {0} foi criada automaticamente"
@@ -13948,7 +13963,7 @@ msgstr ""
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14047,7 +14062,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr "A moeda para {0} deve ser {1}"
@@ -14397,6 +14412,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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14424,6 +14440,10 @@ msgstr ""
msgid "Customer / Lead Address"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr ""
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14825,7 +14845,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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr "Cliente {0} não pertence ao projeto {1}"
@@ -15177,7 +15197,7 @@ msgstr ""
msgid "Date of Joining"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr "Data da Transação"
@@ -15314,11 +15334,11 @@ msgstr "Caro Administrador de Sistema,"
msgid "Debit"
msgstr "Débito"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr "Débito ({0})"
@@ -15392,7 +15412,7 @@ msgstr ""
msgid "Debit To is required"
msgstr "Para Débito é necessária"
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr ""
@@ -16459,7 +16479,7 @@ msgstr ""
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16534,9 +16554,9 @@ msgstr ""
msgid "Depreciate based on shifts"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr "Valor Depreciado"
@@ -16592,6 +16612,14 @@ msgstr "Lançamento de Depreciação"
msgid "Depreciation Entry Posting Status"
msgstr ""
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr ""
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16600,7 +16628,7 @@ msgstr ""
msgid "Depreciation Expense Account"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr ""
@@ -17486,6 +17514,10 @@ msgstr ""
msgid "Discount Percentage"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr ""
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr ""
@@ -17718,7 +17750,7 @@ msgstr ""
msgid "Disposal Date"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr ""
@@ -17998,7 +18030,7 @@ msgstr ""
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr ""
@@ -19037,7 +19069,7 @@ msgstr "Vazio"
msgid "Ems(Pica)"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr ""
@@ -19388,7 +19420,7 @@ msgstr ""
msgid "Enter a name for this Holiday List."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr "Insira o valor a ser resgatado."
@@ -19449,7 +19481,7 @@ msgstr ""
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr "Insira o valor de {0}."
@@ -19469,7 +19501,7 @@ msgid "Entity"
msgstr ""
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19564,7 +19596,7 @@ msgstr "Erro ao avaliar a fórmula de critérios"
msgid "Error in party matching for Bank Transaction {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr ""
@@ -19614,10 +19646,8 @@ msgstr ""
msgid "Evaluation Period"
msgstr ""
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
msgstr ""
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
@@ -19979,7 +20009,7 @@ msgstr ""
msgid "Expense"
msgstr "Despesa"
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr "Despesa conta / Diferença ({0}) deve ser um 'resultados' conta"
@@ -20024,7 +20054,7 @@ msgstr "Despesa conta / Diferença ({0}) deve ser um 'resultados' conta"
msgid "Expense Account"
msgstr "Conta de Despesas"
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr "Conta de Despesas Ausente"
@@ -20331,7 +20361,7 @@ msgstr ""
msgid "Failure Description"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr ""
@@ -21007,6 +21037,10 @@ msgstr ""
msgid "Fixed Asset Register"
msgstr "Registro de Ativo Fixo"
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21137,7 +21171,7 @@ msgstr "Para Fornecedor Padrão (opcional)"
msgid "For Item"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr ""
@@ -22029,7 +22063,7 @@ msgstr "Referência de Pagamento Futuro"
msgid "Future Payments"
msgstr "Pagamentos Futuros"
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr ""
@@ -22045,7 +22079,7 @@ msgstr ""
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr "Lançamento GL"
@@ -22311,8 +22345,8 @@ msgid "Get Items"
msgstr "Obter Itens"
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22671,7 +22705,7 @@ msgstr ""
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22681,7 +22715,7 @@ msgstr ""
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22802,8 +22836,8 @@ msgstr ""
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr "Valor Bruto de Compra"
@@ -23154,7 +23188,7 @@ msgstr ""
msgid "Height (cm)"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr ""
@@ -23193,7 +23227,7 @@ msgstr ""
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr ""
@@ -23289,7 +23323,7 @@ msgstr "Segurar"
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr "Segurar Fatura"
@@ -23383,6 +23417,10 @@ msgstr "Horas"
msgid "Hours Spent"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr ""
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23719,6 +23757,10 @@ msgstr ""
msgid "If more than one package of the same type (for print)"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr ""
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23735,6 +23777,10 @@ msgstr ""
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr ""
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23817,6 +23863,10 @@ msgstr "Se marcado, vários materiais podem ser usados para uma única Ordem de
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr ""
@@ -23911,7 +23961,7 @@ msgstr ""
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -23963,7 +24013,7 @@ msgstr ""
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr ""
@@ -24726,7 +24776,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24799,7 +24849,7 @@ msgstr ""
msgid "Incorrect Stock Value Report"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr ""
@@ -24966,13 +25016,13 @@ msgstr "Inserir novos registros"
msgid "Inspected By"
msgstr "Inspecionado Por"
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr ""
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr "Inspeção Obrigatória"
@@ -24989,7 +25039,7 @@ msgstr ""
msgid "Inspection Required before Purchase"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr ""
@@ -25019,7 +25069,7 @@ msgstr "Nota de Instalação"
msgid "Installation Note Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr "A nota de instalação {0} já foi enviada"
@@ -25077,7 +25127,7 @@ msgstr "Permissões Insuficientes"
#: 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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "Estoque Insuficiente"
@@ -25268,7 +25318,7 @@ msgstr ""
msgid "Internal Work History"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr ""
@@ -25304,7 +25354,7 @@ msgid "Invalid Account"
msgstr "Conta Inválida"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr ""
@@ -25332,7 +25382,7 @@ msgstr ""
msgid "Invalid Child Procedure"
msgstr "Procedimento de Criança Inválido"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr "Empresa Inválida Para Transação Entre Empresas."
@@ -25390,7 +25440,7 @@ msgid "Invalid Ledger Entries"
msgstr ""
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr "Entrada de Abertura Inválida"
@@ -25418,7 +25468,7 @@ msgstr ""
msgid "Invalid Priority"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr ""
@@ -25502,8 +25552,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr ""
@@ -25511,7 +25561,7 @@ msgstr ""
msgid "Invalid {0}"
msgstr "Inválido {0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr "{0} inválido para transação entre empresas."
@@ -25721,7 +25771,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26773,6 +26823,8 @@ msgstr ""
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26791,7 +26843,11 @@ msgstr "Código do Item"
msgid "Item Code (Final Product)"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr ""
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr ""
@@ -27195,6 +27251,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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28115,7 +28172,7 @@ msgstr ""
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr "Lançamento no Livro Diário {0} não tem conta {1} ou já conciliado com outro comprovante"
@@ -28321,7 +28378,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29037,7 +29094,7 @@ msgstr ""
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29708,7 +29765,7 @@ msgstr ""
msgid "Mandatory Depends On"
msgstr "Obrigatório Depende"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr ""
@@ -29798,6 +29855,7 @@ msgstr "A entrada manual não pode ser criada! Desative a entrada automática pa
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30356,6 +30414,7 @@ msgid "Material Requested"
msgstr ""
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr ""
@@ -30711,7 +30770,7 @@ msgstr ""
msgid "Message Examples"
msgstr "Exemplos de Mensagens"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr "Mensagem Enviada"
@@ -31025,8 +31084,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr "Conta Em Falta"
@@ -31044,6 +31103,10 @@ msgstr ""
msgid "Missing Default in Company"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr ""
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr ""
@@ -31076,7 +31139,7 @@ msgstr "Faltando Valores Obrigatórios"
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr ""
@@ -31742,7 +31805,7 @@ msgstr ""
msgid "Needs Analysis"
msgstr "Precisa de Análise"
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr ""
@@ -32174,7 +32237,7 @@ msgstr ""
msgid "New Sales Person Name"
msgstr "Nome do Novo Vendedor"
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr ""
@@ -32210,7 +32273,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:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr "A nova data de lançamento deve estar no futuro"
@@ -32319,7 +32382,7 @@ msgstr "Nenhuma Ação"
msgid "No Answer"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr "Nenhum cliente encontrado para transações entre empresas que representam a empresa {0}"
@@ -32376,9 +32439,9 @@ msgstr ""
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr "Nenhuma Permissão"
@@ -32413,7 +32476,7 @@ msgstr ""
msgid "No Summary"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr "Nenhum fornecedor encontrado para transações entre empresas que representam a empresa {0}"
@@ -32511,7 +32574,7 @@ msgstr ""
msgid "No items to be received are overdue"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr ""
@@ -32645,11 +32708,11 @@ msgstr ""
msgid "No values"
msgstr "Sem valores"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr "Nenhum {0} encontrado para transações entre empresas."
@@ -32684,7 +32747,7 @@ msgstr ""
msgid "Non Profit"
msgstr "Sem Fins Lucrativos"
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr "Itens não estocáveis"
@@ -32863,7 +32926,7 @@ msgstr ""
msgid "Note: Email will not be sent to disabled users"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr ""
@@ -32883,7 +32946,7 @@ msgstr ""
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr "Observação: {0}"
@@ -32899,6 +32962,7 @@ msgstr "Observação: {0}"
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33334,6 +33398,12 @@ msgstr ""
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr ""
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr ""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33535,8 +33605,8 @@ msgstr "Abertura (dr)"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr "Depreciação Acumulada Inicial"
@@ -33578,7 +33648,7 @@ msgstr ""
msgid "Opening Entry"
msgstr ""
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr ""
@@ -33606,7 +33676,7 @@ msgid "Opening Invoice Item"
msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 ""
@@ -33680,7 +33750,7 @@ msgstr ""
msgid "Operating Cost Per BOM Quantity"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr "Custo Operacional Conforme Ordem de Serviço / Lista Técnica"
@@ -33836,7 +33906,7 @@ msgstr "Operações"
msgid "Operations Routing"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr "As operações não podem ser deixadas em branco"
@@ -34428,7 +34498,7 @@ msgstr ""
msgid "Over Picking Allowance"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr ""
@@ -34880,7 +34950,7 @@ msgstr ""
msgid "Packed Items"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr ""
@@ -34915,7 +34985,7 @@ msgstr "Lista de Embalagem"
msgid "Packing Slip Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr ""
@@ -35001,7 +35071,7 @@ msgstr "Pago"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35276,7 +35346,7 @@ msgstr ""
msgid "Partial Payment in POS Transactions are not allowed."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr ""
@@ -35470,9 +35540,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35633,9 +35703,9 @@ 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35800,7 +35870,7 @@ msgstr ""
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -35936,7 +36006,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr ""
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr "Entrada de pagamento já foi criada"
@@ -36145,7 +36215,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36171,11 +36241,11 @@ msgstr ""
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr "Pedido de Pagamento Para {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr ""
@@ -36333,7 +36403,7 @@ msgstr ""
msgid "Payment Unlink Error"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr ""
@@ -36654,7 +36724,7 @@ msgstr "Período"
msgid "Period Based On"
msgstr "Período Baseado Em"
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr ""
@@ -37257,7 +37327,7 @@ msgstr ""
msgid "Please add {1} role to user {0}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr ""
@@ -37265,7 +37335,7 @@ msgstr ""
msgid "Please attach CSV file"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr ""
@@ -37278,7 +37348,7 @@ msgstr ""
msgid "Please cancel related transaction."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr ""
@@ -37355,7 +37425,7 @@ msgstr ""
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr ""
@@ -37479,7 +37549,7 @@ msgstr "Digite Recibo de compra primeiro"
msgid "Please enter Receipt Document"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr ""
@@ -37604,8 +37674,8 @@ msgstr ""
msgid "Please mention 'Weight UOM' along with Weight."
msgstr ""
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr ""
@@ -37733,7 +37803,7 @@ msgstr ""
msgid "Please select Posting Date first"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr ""
@@ -37765,7 +37835,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr "Selecione uma lista de materiais"
@@ -37855,6 +37925,10 @@ 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
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr ""
@@ -37863,7 +37937,7 @@ msgstr ""
msgid "Please select atleast one operation to create Job Card"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr ""
@@ -37944,15 +38018,15 @@ msgstr ""
msgid "Please set 'Apply Additional Discount On'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr "Por Favor, Defina a \"conta de Ganhos/perdas na Eliminação de Ativos\" na Empresa {0}"
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr ""
@@ -37960,7 +38034,7 @@ msgstr ""
msgid "Please set Account"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr ""
@@ -37986,7 +38060,7 @@ msgstr ""
msgid "Please set Company"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr ""
@@ -38004,7 +38078,7 @@ msgstr ""
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr ""
@@ -38067,7 +38141,7 @@ msgstr ""
msgid "Please set an Address on the Company '%s'"
msgstr ""
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr ""
@@ -38083,23 +38157,23 @@ msgstr ""
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr "Defina Caixa padrão ou conta bancária no Modo de pagamento {0}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr "Defina dinheiro ou conta bancária padrão no modo de pagamento {}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "Defina dinheiro ou conta bancária padrão no modo de pagamentos {}"
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr ""
@@ -38203,7 +38277,7 @@ msgstr ""
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr ""
@@ -38216,7 +38290,7 @@ msgid "Please specify Company"
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr ""
@@ -38389,6 +38463,7 @@ msgstr "Despesas Postais"
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38423,11 +38498,11 @@ msgstr "Despesas Postais"
#: 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38446,6 +38521,7 @@ msgstr "Despesas Postais"
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38455,6 +38531,7 @@ msgstr "Despesas Postais"
#: 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_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
@@ -39020,6 +39097,14 @@ msgstr "Código do Item da Regra de Precificação"
msgid "Pricing Rule Item Group"
msgstr "Grupo de Itens de Regras de Precificação"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr ""
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr ""
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr "A regra de precificação {0} é atualizada"
@@ -39078,6 +39163,10 @@ msgstr "A regra de precificação {0} é atualizada"
msgid "Pricing Rules"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr ""
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39465,7 +39554,7 @@ msgstr ""
msgid "Process Loss"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr ""
@@ -39955,7 +40044,7 @@ msgstr ""
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40430,7 +40519,7 @@ msgstr "Analítico de Compras"
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr "Data da Compra"
@@ -40586,7 +40675,7 @@ msgstr "Gerente de Cadastros de Compras"
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40762,9 +40851,9 @@ msgstr "Preço de Compra Lista"
#. 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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41645,6 +41734,7 @@ msgstr "Objetivo de Revisão de Qualidade"
#: 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/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
@@ -41761,7 +41851,7 @@ msgstr ""
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr ""
@@ -42610,7 +42700,7 @@ msgid "Reason"
msgstr "Motivo"
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "Razão Para Colocar Em Espera"
@@ -43046,7 +43136,7 @@ msgstr ""
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr "Resgatar Pontos de Fidelidade"
@@ -43178,7 +43268,7 @@ msgstr ""
msgid "Reference"
msgstr "Referência"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr "Referência #{0} datado de {1}"
@@ -43316,7 +43406,7 @@ msgstr "Nome de Referência"
msgid "Reference No"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr "Número de referência e Referência Data é necessário para {0}"
@@ -43324,11 +43414,11 @@ msgstr "Número de referência e Referência Data é necessário para {0}"
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr "Referência Não é obrigatório se você entrou Data de Referência"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr "Referência No."
@@ -43442,11 +43532,11 @@ msgstr "Referência: {0}, Código do Item: {1} e Cliente: {2}"
msgid "References"
msgstr "Referências"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr ""
@@ -43591,8 +43681,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43611,7 +43701,7 @@ msgstr ""
msgid "Remaining"
msgstr "Remanescente"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr ""
@@ -43624,7 +43714,7 @@ msgstr "Saldo Remanescente"
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr "Observação"
@@ -43673,7 +43763,7 @@ msgstr "Observação"
#: 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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -43984,7 +44074,7 @@ msgstr ""
msgid "Repost Status"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr ""
@@ -44308,7 +44398,7 @@ msgstr ""
msgid "Reseller"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr ""
@@ -44777,7 +44867,7 @@ msgstr "Devolução"
msgid "Return / Credit Note"
msgstr "Devolução / Nota de Crédito"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr "Devolução / Nota de Débito"
@@ -45301,12 +45391,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: 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/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr ""
@@ -45452,7 +45542,7 @@ msgstr ""
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr ""
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr ""
@@ -45476,11 +45566,11 @@ msgstr ""
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr ""
@@ -45500,7 +45590,7 @@ msgstr ""
msgid "Row #{0}: Item {1} does not exist"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr ""
@@ -45536,7 +45626,7 @@ 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:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr ""
@@ -45581,15 +45671,15 @@ msgstr ""
msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr ""
@@ -45598,7 +45688,7 @@ msgstr ""
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr ""
@@ -45692,19 +45782,19 @@ msgstr ""
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr ""
@@ -45712,8 +45802,8 @@ msgstr ""
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr ""
@@ -45894,7 +45984,7 @@ msgstr ""
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr ""
@@ -45902,11 +45992,11 @@ msgstr ""
msgid "Row {0}: Activity Type is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr "Linha {0}: Avanço contra o Cliente deve estar de crédito"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr "Linha {0}: Adiantamento relacionado com o fornecedor deve ser um débito"
@@ -45926,7 +46016,7 @@ msgstr ""
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr ""
@@ -45942,7 +46032,7 @@ msgstr ""
msgid "Row {0}: Cost center is required for an item {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr "Linha {0}: Lançamento de crédito não pode ser relacionado a uma {1}"
@@ -45950,7 +46040,7 @@ msgstr "Linha {0}: Lançamento de crédito não pode ser relacionado a uma {1}"
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr "Linha {0}: Lançamento de débito não pode ser relacionado a uma {1}"
@@ -45966,7 +46056,7 @@ msgstr "Linha {0}: a data de vencimento na tabela Condições de pagamento não
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "Linha {0}: Taxa de Câmbio é obrigatória"
@@ -46000,7 +46090,7 @@ msgstr "Linha {0}: É obrigatório colocar a Periodicidade."
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46012,7 +46102,7 @@ msgstr "Linha {0}: do tempo deve ser menor que a hora"
msgid "Row {0}: Hours value must be greater than zero."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr "Linha {0}: referência inválida {1}"
@@ -46036,7 +46126,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr ""
@@ -46044,7 +46134,7 @@ msgstr ""
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr "Linha {0}: Parceiro / Conta não coincidem com {1} / {2} em {3} {4}"
@@ -46056,11 +46146,11 @@ msgstr ""
msgid "Row {0}: Payment Term is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr "Linha {0}: o pagamento relacionado a Pedidos de Compra/Venda deve ser sempre marcado como adiantamento"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr "Linha {0}: Por favor selecione 'É Adiantamento' se este é um lançamento de adiantamento relacionado à conta {1}."
@@ -46128,7 +46218,7 @@ msgstr ""
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr "Linha {0}: Item subcontratado é obrigatório para a matéria-prima {1}"
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46152,7 +46242,7 @@ msgstr ""
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "Linha {0}: Fator de Conversão da Unidade de Medida é obrigatório"
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr ""
@@ -46173,7 +46263,7 @@ msgstr "Linha {0}: {1} deve ser maior que 0"
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr "Linha {0}: {1} {2} não corresponde com {3}"
@@ -46566,7 +46656,7 @@ msgstr ""
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr "A Fatura de Venda {0} já foi enviada"
@@ -46795,7 +46885,7 @@ msgstr ""
msgid "Sales Order Trends"
msgstr "Tendência de Pedidos de Venda"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr ""
@@ -47305,8 +47395,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47577,7 +47667,7 @@ msgstr ""
msgid "Scrap Warehouse"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr ""
@@ -47650,7 +47740,7 @@ msgstr ""
msgid "Section"
msgstr "Seção"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr "Código da Seção"
@@ -48020,7 +48110,7 @@ msgstr ""
msgid "Selected POS Opening Entry should be open."
msgstr "A entrada de abertura de PDV selecionada deve estar aberta."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr "A Lista de Preços Selecionada deve ter campos de compra e venda verificados."
@@ -48204,7 +48294,7 @@ msgstr ""
msgid "Sender"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr "Enviando"
@@ -48328,7 +48418,9 @@ msgstr ""
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48359,7 +48451,9 @@ msgid "Serial No Count"
msgstr "Série Sem Contagem"
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr ""
@@ -48367,7 +48461,7 @@ msgstr ""
msgid "Serial No Range"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr ""
@@ -48407,6 +48501,13 @@ msgstr "Número de Série e Lote"
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr ""
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr ""
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr ""
@@ -48436,7 +48537,7 @@ msgstr ""
msgid "Serial No {0} does not exist"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr ""
@@ -48485,7 +48586,7 @@ msgstr ""
msgid "Serial Nos and Batches"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr ""
@@ -48563,11 +48664,11 @@ msgstr ""
msgid "Serial and Batch Bundle"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr ""
@@ -49001,7 +49102,7 @@ msgstr ""
msgid "Set Loyalty Program"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr "Definir Nova Data de Lançamento"
@@ -49256,7 +49357,7 @@ msgstr ""
msgid "Setting up company"
msgstr "Criação de empresa"
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49440,7 +49541,7 @@ msgstr ""
msgid "Shipment details"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr "Entregas"
@@ -49687,6 +49788,10 @@ msgstr "Mostrar Entradas Canceladas"
msgid "Show Completed"
msgstr "Mostrar Concluído"
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr ""
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr "Mostrar Montante Cumulativo"
@@ -49802,7 +49907,7 @@ msgstr ""
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr ""
@@ -50107,13 +50212,27 @@ msgstr "Origem"
msgid "Source DocType"
msgstr ""
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr ""
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr ""
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr ""
@@ -50184,7 +50303,7 @@ msgstr ""
msgid "Source Warehouse Address Link"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr ""
@@ -50695,7 +50814,7 @@ msgstr "Estado / Província"
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51038,7 +51157,7 @@ msgstr "Lançamento de Estoque {0} criado"
msgid "Stock Entry {0} has created"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr "Lançamento no Estoque {0} não é enviado"
@@ -51261,13 +51380,13 @@ msgstr ""
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51276,13 +51395,13 @@ msgstr ""
msgid "Stock Reservation"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr ""
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr ""
@@ -51304,7 +51423,7 @@ msgstr ""
msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr ""
@@ -51549,7 +51668,7 @@ msgstr ""
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr ""
@@ -51565,7 +51684,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr ""
@@ -52433,10 +52552,15 @@ 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "Fornecedor"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr ""
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52549,7 +52673,7 @@ msgstr ""
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr "Data de Emissão da Nota Fiscal de Compra"
@@ -52563,8 +52687,8 @@ 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr ""
@@ -53111,16 +53235,16 @@ msgstr ""
msgid "System will notify to increase or decrease quantity or amount "
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr ""
@@ -53137,7 +53261,7 @@ msgstr ""
msgid "TDS Payable"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr ""
@@ -53693,7 +53817,7 @@ msgstr ""
msgid "Tax Withheld Vouchers"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr ""
@@ -54318,7 +54442,7 @@ msgstr "O Acesso À Solicitação de Cotação do Portal Está Desabilitado. Par
msgid "The BOM which will be replaced"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr ""
@@ -54346,7 +54470,7 @@ msgstr ""
msgid "The Loyalty Program isn't valid for the selected company"
msgstr "O programa de fidelidade não é válido para a empresa selecionada"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr ""
@@ -54370,7 +54494,7 @@ msgstr ""
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr ""
@@ -54392,7 +54516,7 @@ msgstr ""
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr ""
@@ -54433,7 +54557,7 @@ msgstr "O campo do Acionista não pode estar em branco"
msgid "The field To Shareholder cannot be blank"
msgstr "O campo Acionista não pode estar em branco"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr ""
@@ -54449,7 +54573,7 @@ msgstr ""
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr ""
@@ -54710,6 +54834,10 @@ msgstr ""
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr ""
@@ -54976,7 +55104,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr ""
@@ -54984,7 +55112,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr ""
@@ -55759,6 +55887,10 @@ msgstr "Para incluir impostos na linha {0} na taxa de Item, os impostos em linha
msgid "To merge, following properties must be same for both items"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr "Para anular isso, ative ';{0}'; na empresa {1}"
@@ -55776,7 +55908,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr ""
@@ -55998,7 +56130,7 @@ msgstr ""
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56160,7 +56292,7 @@ msgstr "O valor total de crédito / débito deve ser o mesmo que o lançamento n
msgid "Total Debit"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr ""
@@ -56753,6 +56885,10 @@ msgstr "Totais"
msgid "Traceability"
msgstr "Rastreabilidade"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr ""
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56793,7 +56929,7 @@ msgstr ""
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -56891,7 +57027,7 @@ msgstr ""
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr ""
@@ -56913,7 +57049,7 @@ msgstr ""
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57510,7 +57646,11 @@ msgstr "Total Não Alocado"
msgid "Unassigned Qty"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr "Desbloquear Fatura"
@@ -58877,7 +59017,7 @@ msgstr ""
msgid "Vendor Invoices"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr "Nome do Vendedor"
@@ -58944,7 +59084,7 @@ msgstr "Configurações de Vídeo"
#: 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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59135,11 +59275,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59174,7 +59314,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr ""
@@ -59206,9 +59346,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59227,6 +59367,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_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
@@ -59436,6 +59577,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_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
@@ -59544,7 +59686,7 @@ msgstr ""
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr ""
@@ -59557,7 +59699,7 @@ msgid "Warehouse not found against the account {0}"
msgstr "Armazém não encontrado na conta {0}"
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr ""
@@ -59708,7 +59850,7 @@ msgstr ""
msgid "Warning!"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr "Aviso: Outra {0} # {1} existe contra entrada de material {2}"
@@ -60191,6 +60333,7 @@ msgstr "Armazém de Trabalho Em Andamento"
#: 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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "Ordem de Trabalho"
@@ -60666,7 +60809,7 @@ msgstr ""
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr ""
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr "Você não está autorizado para adicionar ou atualizar entradas antes de {0}"
@@ -60698,7 +60841,7 @@ msgstr "Você também pode definir uma conta CWIP padrão na Empresa {}"
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr "Você não pode lançar o comprovante atual na coluna 'Contra Entrada do Livro Diário'"
@@ -60715,7 +60858,7 @@ msgstr "Você só pode resgatar no máximo {0} pontos nesse pedido."
msgid "You can only select one mode of payment as default"
msgstr "Você só pode selecionar um modo de pagamento como padrão"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr "Você pode resgatar até {0}."
@@ -60747,11 +60890,11 @@ msgstr ""
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr "Você não pode criar ou cancelar qualquer lançamento contábil no período contábil fechado {0}"
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr "Você não pode ter débito e crédito na mesma conta"
@@ -60767,7 +60910,7 @@ msgstr "Você não pode editar o nó raiz."
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr "Você não pode resgatar mais de {0}."
@@ -60799,7 +60942,7 @@ msgstr "Você não tem permissão para {} itens em um {}."
msgid "You don't have enough Loyalty Points to redeem"
msgstr "Você não tem suficientes pontos de lealdade para resgatar"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr "Você não tem pontos suficientes para resgatar."
@@ -61225,7 +61368,7 @@ msgstr ""
msgid "to"
msgstr "para"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr ""
@@ -61265,7 +61408,7 @@ msgstr ""
msgid "{0} '{1}' is disabled"
msgstr "{0} '{1}' está desativado"
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr "{0} '{1}' não localizado no Ano Fiscal {2}"
@@ -61297,7 +61440,7 @@ msgstr "{0} o cupom usado é {1}. a quantidade permitida está esgotada"
msgid "{0} Digest"
msgstr ""
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr "{0} Número {1} já é usado em {2} {3}"
@@ -61313,7 +61456,7 @@ msgstr "{0} pedido para {1}"
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr ""
@@ -61329,19 +61472,19 @@ msgstr ""
msgid "{0} account not found while submitting purchase receipt"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr "{0} contra duplicata {1} na data {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr "{0} relacionado ao Pedido de Compra {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr "{0} contra Fatura de Venda {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr "{0} contra o Pedido de Venda {1}"
@@ -61349,7 +61492,7 @@ msgstr "{0} contra o Pedido de Venda {1}"
msgid "{0} already has a Parent Procedure {1}."
msgstr "{0} já tem um procedimento pai {1}."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr ""
@@ -61408,7 +61551,7 @@ msgstr "{0} entrou duas vezes no Imposto do Item"
msgid "{0} entered twice {1} in Item Taxes"
msgstr ""
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr "{0} para {1}"
@@ -61461,7 +61604,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr ""
@@ -61536,7 +61679,7 @@ msgstr "{0} itens produzidos"
msgid "{0} must be negative in return document"
msgstr "{0} deve ser negativo no documento de devolução"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr ""
@@ -61552,7 +61695,7 @@ msgstr "{0} parâmetro é inválido"
msgid "{0} payment entries can not be filtered by {1}"
msgstr "{0} entradas de pagamento não podem ser filtrados por {1}"
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr ""
@@ -61613,7 +61756,7 @@ msgstr ""
msgid "{0} {1} Manually"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr ""
@@ -61678,7 +61821,7 @@ msgstr "{0} {1} está cancelado ou parado"
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr "{0} {1} é cancelado então a ação não pode ser concluída"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr ""
@@ -61690,7 +61833,7 @@ msgstr "{0} {1} está desativado"
msgid "{0} {1} is frozen"
msgstr "{0} {1} está congelado"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr "{0} {1} está totalmente faturado"
@@ -61702,12 +61845,12 @@ msgstr "{0} {1} não está ativo"
msgid "{0} {1} is not associated with {2} {3}"
msgstr "{0} {1} não está associado com {2} {3}"
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr "{0} {1} não foi enviado"
@@ -61719,7 +61862,7 @@ msgstr ""
msgid "{0} {1} must be submitted"
msgstr "{0} {1} deve ser enviado"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr ""
@@ -61754,7 +61897,7 @@ msgstr ""
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr ""
@@ -61832,7 +61975,7 @@ msgstr ""
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr ""
@@ -61840,7 +61983,7 @@ msgstr ""
msgid "{ref_doctype} {ref_name} is {status}."
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr ""
@@ -61898,7 +62041,7 @@ msgstr ""
msgid "{} To Bill"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr "{} não pode ser cancelado porque os pontos de fidelidade ganhos foram resgatados. Primeiro cancele o {} Não {}"
diff --git a/erpnext/locale/ru.po b/erpnext/locale/ru.po
index 0264662c53e..3e943e9a107 100644
--- a/erpnext/locale/ru.po
+++ b/erpnext/locale/ru.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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:10\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:06\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Russian\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr ""
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr ""
msgid "'Default {0} Account' in Company {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr ""
@@ -840,11 +840,11 @@ msgstr ""
msgid "Your Shortcuts"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr ""
@@ -1215,10 +1215,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1523,7 +1523,7 @@ msgstr ""
msgid "Account {0}: You can not assign itself as parent account"
msgstr ""
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr ""
@@ -2012,7 +2012,7 @@ msgstr ""
msgid "Accounts Manager"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr ""
@@ -2199,7 +2199,7 @@ msgstr ""
msgid "Accounts User"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr ""
@@ -2559,6 +2559,10 @@ msgstr ""
msgid "Actual Expense"
msgstr ""
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr ""
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2696,7 +2700,7 @@ msgstr ""
msgid "Add Child"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr ""
@@ -3502,7 +3506,7 @@ msgstr ""
msgid "Advance amount cannot be greater than {0} {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr ""
@@ -3559,7 +3563,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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr ""
@@ -3628,7 +3632,7 @@ msgstr ""
msgid "Against Income Account"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr ""
@@ -3676,7 +3680,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr ""
@@ -3688,7 +3692,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr ""
@@ -3700,8 +3704,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr ""
@@ -3827,7 +3831,7 @@ msgstr ""
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr ""
@@ -3995,7 +3999,7 @@ msgstr ""
msgid "All items have already been Invoiced/Returned"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr ""
@@ -4021,7 +4025,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:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr ""
@@ -4907,7 +4911,7 @@ msgstr ""
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5047,7 +5051,7 @@ msgstr ""
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr ""
@@ -5198,7 +5202,7 @@ msgstr ""
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr ""
@@ -5781,7 +5785,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5823,7 +5827,7 @@ msgstr ""
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr ""
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr ""
@@ -5862,7 +5866,7 @@ msgstr ""
msgid "Asset Finance Book"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr ""
@@ -5938,7 +5942,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr ""
@@ -6024,9 +6028,9 @@ msgstr ""
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr ""
@@ -6055,7 +6059,7 @@ msgstr ""
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr ""
@@ -6087,7 +6091,7 @@ msgstr ""
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr ""
@@ -6099,11 +6103,11 @@ msgstr ""
msgid "Asset returned"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr ""
@@ -6128,7 +6132,7 @@ msgstr ""
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr ""
@@ -6161,7 +6165,15 @@ msgstr ""
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr ""
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr ""
@@ -6542,7 +6554,7 @@ msgstr ""
msgid "Auto Reconcile Payments"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr ""
@@ -6552,7 +6564,7 @@ msgstr ""
msgid "Auto Reconciliation Job Trigger"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr ""
@@ -6727,7 +6739,7 @@ msgstr ""
msgid "Available Batch Report"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr ""
@@ -6956,7 +6968,7 @@ msgstr ""
msgid "BOM 1"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr ""
@@ -7194,23 +7206,23 @@ msgstr ""
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr ""
@@ -7281,7 +7293,7 @@ msgstr ""
msgid "Balance (Dr - Cr)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr ""
@@ -7760,7 +7772,7 @@ msgstr ""
msgid "Base Tax Withholding Net Total"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr ""
@@ -7965,7 +7977,9 @@ msgstr ""
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -7976,7 +7990,7 @@ msgstr ""
msgid "Batch No is mandatory"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr ""
@@ -7999,7 +8013,7 @@ msgstr ""
msgid "Batch Nos"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr ""
@@ -8012,7 +8026,7 @@ msgstr ""
msgid "Batch Number Series"
msgstr ""
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr ""
@@ -8125,7 +8139,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8438,8 +8452,8 @@ msgstr ""
msgid "Blanket Order Rate"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr ""
@@ -8555,7 +8569,7 @@ msgstr ""
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr ""
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr ""
@@ -9329,7 +9343,7 @@ msgstr ""
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr ""
@@ -9515,7 +9529,7 @@ msgstr ""
msgid "Cannot Relieve Employee"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr ""
@@ -9531,6 +9545,10 @@ msgstr ""
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr ""
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr ""
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr ""
@@ -9620,7 +9638,7 @@ msgstr ""
msgid "Cannot create root account."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr ""
@@ -9637,7 +9655,7 @@ msgstr ""
msgid "Cannot delete Exchange Gain/Loss row"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr ""
@@ -10083,11 +10101,11 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr ""
@@ -10100,7 +10118,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr ""
@@ -10908,6 +10926,7 @@ msgstr ""
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11055,6 +11074,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11140,8 +11160,8 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11457,7 +11477,7 @@ msgstr ""
msgid "Company and Posting Date is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr ""
@@ -12738,7 +12758,7 @@ 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12757,7 +12777,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -12970,7 +12990,7 @@ msgstr ""
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr ""
@@ -13093,15 +13113,15 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13343,7 +13363,7 @@ msgstr ""
msgid "Create POS Opening Entry"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr ""
@@ -13499,7 +13519,7 @@ msgstr ""
msgid "Creating Delivery Note ..."
msgstr ""
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr ""
@@ -13519,7 +13539,7 @@ msgstr ""
msgid "Creating Purchase Order ..."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13556,11 +13576,6 @@ msgstr ""
msgid "Creation"
msgstr ""
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr ""
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr ""
@@ -13593,11 +13608,11 @@ msgstr ""
msgid "Credit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr ""
@@ -13740,7 +13755,7 @@ 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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr ""
@@ -13948,7 +13963,7 @@ msgstr ""
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14047,7 +14062,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr ""
@@ -14397,6 +14412,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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14424,6 +14440,10 @@ msgstr ""
msgid "Customer / Lead Address"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr ""
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14825,7 +14845,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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr ""
@@ -15177,7 +15197,7 @@ msgstr ""
msgid "Date of Joining"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr ""
@@ -15314,11 +15334,11 @@ msgstr ""
msgid "Debit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr ""
@@ -15392,7 +15412,7 @@ msgstr ""
msgid "Debit To is required"
msgstr ""
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr ""
@@ -16459,7 +16479,7 @@ msgstr ""
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16534,9 +16554,9 @@ msgstr ""
msgid "Depreciate based on shifts"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr ""
@@ -16592,6 +16612,14 @@ msgstr ""
msgid "Depreciation Entry Posting Status"
msgstr ""
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr ""
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16600,7 +16628,7 @@ msgstr ""
msgid "Depreciation Expense Account"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr ""
@@ -17486,6 +17514,10 @@ msgstr ""
msgid "Discount Percentage"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr ""
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr ""
@@ -17718,7 +17750,7 @@ msgstr ""
msgid "Disposal Date"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr ""
@@ -17998,7 +18030,7 @@ msgstr ""
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr ""
@@ -19037,7 +19069,7 @@ msgstr ""
msgid "Ems(Pica)"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr ""
@@ -19388,7 +19420,7 @@ msgstr ""
msgid "Enter a name for this Holiday List."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr ""
@@ -19449,7 +19481,7 @@ msgstr ""
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr ""
@@ -19469,7 +19501,7 @@ msgid "Entity"
msgstr ""
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19564,7 +19596,7 @@ msgstr ""
msgid "Error in party matching for Bank Transaction {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr ""
@@ -19616,10 +19648,8 @@ msgstr ""
msgid "Evaluation Period"
msgstr ""
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
msgstr ""
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
@@ -19981,7 +20011,7 @@ msgstr ""
msgid "Expense"
msgstr ""
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr ""
@@ -20026,7 +20056,7 @@ msgstr ""
msgid "Expense Account"
msgstr ""
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr ""
@@ -20333,7 +20363,7 @@ msgstr ""
msgid "Failure Description"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr ""
@@ -21009,6 +21039,10 @@ msgstr ""
msgid "Fixed Asset Register"
msgstr ""
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21139,7 +21173,7 @@ msgstr ""
msgid "For Item"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr ""
@@ -22031,7 +22065,7 @@ msgstr ""
msgid "Future Payments"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr ""
@@ -22047,7 +22081,7 @@ msgstr ""
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr ""
@@ -22313,8 +22347,8 @@ msgid "Get Items"
msgstr ""
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22673,7 +22707,7 @@ msgstr ""
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22683,7 +22717,7 @@ msgstr ""
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22804,8 +22838,8 @@ msgstr ""
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr ""
@@ -23156,7 +23190,7 @@ msgstr ""
msgid "Height (cm)"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr ""
@@ -23195,7 +23229,7 @@ msgstr ""
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr ""
@@ -23291,7 +23325,7 @@ msgstr ""
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr ""
@@ -23385,6 +23419,10 @@ msgstr ""
msgid "Hours Spent"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr ""
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23721,6 +23759,10 @@ msgstr ""
msgid "If more than one package of the same type (for print)"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr ""
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23737,6 +23779,10 @@ msgstr ""
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr ""
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23819,6 +23865,10 @@ msgstr ""
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr ""
@@ -23913,7 +23963,7 @@ msgstr ""
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -23965,7 +24015,7 @@ msgstr ""
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr ""
@@ -24728,7 +24778,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24801,7 +24851,7 @@ msgstr ""
msgid "Incorrect Stock Value Report"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr ""
@@ -24968,13 +25018,13 @@ msgstr ""
msgid "Inspected By"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr ""
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr ""
@@ -24991,7 +25041,7 @@ msgstr ""
msgid "Inspection Required before Purchase"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr ""
@@ -25021,7 +25071,7 @@ msgstr ""
msgid "Installation Note Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr ""
@@ -25079,7 +25129,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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr ""
@@ -25270,7 +25320,7 @@ msgstr ""
msgid "Internal Work History"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr ""
@@ -25306,7 +25356,7 @@ msgid "Invalid Account"
msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr ""
@@ -25334,7 +25384,7 @@ msgstr ""
msgid "Invalid Child Procedure"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr ""
@@ -25392,7 +25442,7 @@ msgid "Invalid Ledger Entries"
msgstr ""
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr ""
@@ -25420,7 +25470,7 @@ msgstr ""
msgid "Invalid Priority"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr ""
@@ -25504,8 +25554,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr ""
@@ -25513,7 +25563,7 @@ msgstr ""
msgid "Invalid {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr ""
@@ -25723,7 +25773,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26775,6 +26825,8 @@ msgstr ""
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26793,7 +26845,11 @@ msgstr ""
msgid "Item Code (Final Product)"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr ""
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr ""
@@ -27197,6 +27253,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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28117,7 +28174,7 @@ msgstr ""
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr ""
@@ -28323,7 +28380,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29039,7 +29096,7 @@ msgstr ""
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29710,7 +29767,7 @@ msgstr ""
msgid "Mandatory Depends On"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr ""
@@ -29800,6 +29857,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30358,6 +30416,7 @@ msgid "Material Requested"
msgstr ""
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr ""
@@ -30713,7 +30772,7 @@ msgstr ""
msgid "Message Examples"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr ""
@@ -31027,8 +31086,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr ""
@@ -31046,6 +31105,10 @@ msgstr ""
msgid "Missing Default in Company"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr ""
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr ""
@@ -31078,7 +31141,7 @@ msgstr ""
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr ""
@@ -31744,7 +31807,7 @@ msgstr ""
msgid "Needs Analysis"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr ""
@@ -32176,7 +32239,7 @@ msgstr ""
msgid "New Sales Person Name"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr ""
@@ -32212,7 +32275,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:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr ""
@@ -32321,7 +32384,7 @@ msgstr ""
msgid "No Answer"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr ""
@@ -32378,9 +32441,9 @@ msgstr ""
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr ""
@@ -32415,7 +32478,7 @@ msgstr ""
msgid "No Summary"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr ""
@@ -32513,7 +32576,7 @@ msgstr ""
msgid "No items to be received are overdue"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr ""
@@ -32647,11 +32710,11 @@ msgstr ""
msgid "No values"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr ""
@@ -32686,7 +32749,7 @@ msgstr ""
msgid "Non Profit"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr ""
@@ -32865,7 +32928,7 @@ msgstr ""
msgid "Note: Email will not be sent to disabled users"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr ""
@@ -32885,7 +32948,7 @@ msgstr ""
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr ""
@@ -32901,6 +32964,7 @@ msgstr ""
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33336,6 +33400,12 @@ msgstr ""
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr ""
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr ""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33537,8 +33607,8 @@ msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr ""
@@ -33580,7 +33650,7 @@ msgstr ""
msgid "Opening Entry"
msgstr ""
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr ""
@@ -33608,7 +33678,7 @@ msgid "Opening Invoice Item"
msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 ""
@@ -33682,7 +33752,7 @@ msgstr ""
msgid "Operating Cost Per BOM Quantity"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr ""
@@ -33838,7 +33908,7 @@ msgstr ""
msgid "Operations Routing"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr ""
@@ -34430,7 +34500,7 @@ msgstr ""
msgid "Over Picking Allowance"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr ""
@@ -34882,7 +34952,7 @@ msgstr ""
msgid "Packed Items"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr ""
@@ -34917,7 +34987,7 @@ msgstr ""
msgid "Packing Slip Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr ""
@@ -35003,7 +35073,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35278,7 +35348,7 @@ msgstr ""
msgid "Partial Payment in POS Transactions are not allowed."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr ""
@@ -35472,9 +35542,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35635,9 +35705,9 @@ 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35802,7 +35872,7 @@ msgstr ""
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -35938,7 +36008,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr ""
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr ""
@@ -36147,7 +36217,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36173,11 +36243,11 @@ msgstr ""
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr ""
@@ -36335,7 +36405,7 @@ msgstr ""
msgid "Payment Unlink Error"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr ""
@@ -36656,7 +36726,7 @@ msgstr ""
msgid "Period Based On"
msgstr ""
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr ""
@@ -37259,7 +37329,7 @@ msgstr ""
msgid "Please add {1} role to user {0}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr ""
@@ -37267,7 +37337,7 @@ msgstr ""
msgid "Please attach CSV file"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr ""
@@ -37280,7 +37350,7 @@ msgstr ""
msgid "Please cancel related transaction."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr ""
@@ -37357,7 +37427,7 @@ msgstr ""
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr ""
@@ -37481,7 +37551,7 @@ msgstr ""
msgid "Please enter Receipt Document"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr ""
@@ -37606,8 +37676,8 @@ msgstr ""
msgid "Please mention 'Weight UOM' along with Weight."
msgstr ""
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr ""
@@ -37735,7 +37805,7 @@ msgstr ""
msgid "Please select Posting Date first"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr ""
@@ -37767,7 +37837,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr ""
@@ -37857,6 +37927,10 @@ 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
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr ""
@@ -37865,7 +37939,7 @@ msgstr ""
msgid "Please select atleast one operation to create Job Card"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr ""
@@ -37946,15 +38020,15 @@ msgstr ""
msgid "Please set 'Apply Additional Discount On'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr ""
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr ""
@@ -37962,7 +38036,7 @@ msgstr ""
msgid "Please set Account"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr ""
@@ -37988,7 +38062,7 @@ msgstr ""
msgid "Please set Company"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr ""
@@ -38006,7 +38080,7 @@ msgstr ""
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr ""
@@ -38069,7 +38143,7 @@ msgstr ""
msgid "Please set an Address on the Company '%s'"
msgstr ""
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr ""
@@ -38085,23 +38159,23 @@ msgstr ""
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr ""
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr ""
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr ""
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr ""
@@ -38205,7 +38279,7 @@ msgstr ""
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr ""
@@ -38218,7 +38292,7 @@ msgid "Please specify Company"
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr ""
@@ -38391,6 +38465,7 @@ msgstr ""
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38425,11 +38500,11 @@ 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38448,6 +38523,7 @@ msgstr ""
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38457,6 +38533,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_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
@@ -39022,6 +39099,14 @@ msgstr ""
msgid "Pricing Rule Item Group"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr ""
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr ""
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr ""
@@ -39080,6 +39165,10 @@ msgstr ""
msgid "Pricing Rules"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr ""
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39467,7 +39556,7 @@ msgstr ""
msgid "Process Loss"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr ""
@@ -39957,7 +40046,7 @@ msgstr ""
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40432,7 +40521,7 @@ msgstr ""
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr ""
@@ -40588,7 +40677,7 @@ msgstr ""
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40764,9 +40853,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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41647,6 +41736,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/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
@@ -41763,7 +41853,7 @@ msgstr ""
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr ""
@@ -42612,7 +42702,7 @@ msgid "Reason"
msgstr ""
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr ""
@@ -43048,7 +43138,7 @@ msgstr ""
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr ""
@@ -43180,7 +43270,7 @@ msgstr ""
msgid "Reference"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr ""
@@ -43318,7 +43408,7 @@ msgstr ""
msgid "Reference No"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr ""
@@ -43326,11 +43416,11 @@ msgstr ""
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr ""
@@ -43444,11 +43534,11 @@ msgstr ""
msgid "References"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr ""
@@ -43593,8 +43683,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43613,7 +43703,7 @@ msgstr ""
msgid "Remaining"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr ""
@@ -43626,7 +43716,7 @@ msgstr ""
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr ""
@@ -43675,7 +43765,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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -43986,7 +44076,7 @@ msgstr ""
msgid "Repost Status"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr ""
@@ -44310,7 +44400,7 @@ msgstr ""
msgid "Reseller"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr ""
@@ -44779,7 +44869,7 @@ msgstr ""
msgid "Return / Credit Note"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr ""
@@ -45303,12 +45393,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: 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/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr ""
@@ -45454,7 +45544,7 @@ msgstr ""
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr ""
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr ""
@@ -45478,11 +45568,11 @@ msgstr ""
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr ""
@@ -45502,7 +45592,7 @@ msgstr ""
msgid "Row #{0}: Item {1} does not exist"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr ""
@@ -45538,7 +45628,7 @@ 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:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr ""
@@ -45583,15 +45673,15 @@ msgstr ""
msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr ""
@@ -45600,7 +45690,7 @@ msgstr ""
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr ""
@@ -45694,19 +45784,19 @@ msgstr ""
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr ""
@@ -45714,8 +45804,8 @@ msgstr ""
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr ""
@@ -45896,7 +45986,7 @@ msgstr ""
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr ""
@@ -45904,11 +45994,11 @@ msgstr ""
msgid "Row {0}: Activity Type is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr ""
@@ -45928,7 +46018,7 @@ msgstr ""
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr ""
@@ -45944,7 +46034,7 @@ msgstr ""
msgid "Row {0}: Cost center is required for an item {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr ""
@@ -45952,7 +46042,7 @@ msgstr ""
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr ""
@@ -45968,7 +46058,7 @@ msgstr ""
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr ""
@@ -46002,7 +46092,7 @@ msgstr ""
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46014,7 +46104,7 @@ msgstr ""
msgid "Row {0}: Hours value must be greater than zero."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr ""
@@ -46038,7 +46128,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr ""
@@ -46046,7 +46136,7 @@ msgstr ""
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr ""
@@ -46058,11 +46148,11 @@ msgstr ""
msgid "Row {0}: Payment Term is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr ""
@@ -46130,7 +46220,7 @@ msgstr ""
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46154,7 +46244,7 @@ msgstr ""
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr ""
@@ -46175,7 +46265,7 @@ msgstr ""
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr ""
@@ -46568,7 +46658,7 @@ msgstr ""
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr ""
@@ -46797,7 +46887,7 @@ msgstr ""
msgid "Sales Order Trends"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr ""
@@ -47307,8 +47397,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47579,7 +47669,7 @@ msgstr ""
msgid "Scrap Warehouse"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr ""
@@ -47652,7 +47742,7 @@ msgstr ""
msgid "Section"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr ""
@@ -48022,7 +48112,7 @@ msgstr ""
msgid "Selected POS Opening Entry should be open."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr ""
@@ -48206,7 +48296,7 @@ msgstr ""
msgid "Sender"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr ""
@@ -48330,7 +48420,9 @@ msgstr ""
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48361,7 +48453,9 @@ msgid "Serial No Count"
msgstr ""
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr ""
@@ -48369,7 +48463,7 @@ msgstr ""
msgid "Serial No Range"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr ""
@@ -48409,6 +48503,13 @@ msgstr ""
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr ""
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr ""
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr ""
@@ -48438,7 +48539,7 @@ msgstr ""
msgid "Serial No {0} does not exist"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr ""
@@ -48487,7 +48588,7 @@ msgstr ""
msgid "Serial Nos and Batches"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr ""
@@ -48565,11 +48666,11 @@ msgstr ""
msgid "Serial and Batch Bundle"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr ""
@@ -49003,7 +49104,7 @@ msgstr ""
msgid "Set Loyalty Program"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr ""
@@ -49258,7 +49359,7 @@ msgstr ""
msgid "Setting up company"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49442,7 +49543,7 @@ msgstr ""
msgid "Shipment details"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr ""
@@ -49689,6 +49790,10 @@ msgstr ""
msgid "Show Completed"
msgstr ""
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr ""
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr ""
@@ -49804,7 +49909,7 @@ msgstr ""
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr ""
@@ -50109,13 +50214,27 @@ msgstr ""
msgid "Source DocType"
msgstr ""
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr ""
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr ""
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr ""
@@ -50186,7 +50305,7 @@ msgstr ""
msgid "Source Warehouse Address Link"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr ""
@@ -50697,7 +50816,7 @@ msgstr ""
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51040,7 +51159,7 @@ msgstr ""
msgid "Stock Entry {0} has created"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr ""
@@ -51263,13 +51382,13 @@ msgstr ""
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51278,13 +51397,13 @@ msgstr ""
msgid "Stock Reservation"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr ""
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr ""
@@ -51306,7 +51425,7 @@ msgstr ""
msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr ""
@@ -51551,7 +51670,7 @@ msgstr ""
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr ""
@@ -51567,7 +51686,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr ""
@@ -52435,10 +52554,15 @@ 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr ""
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52551,7 +52675,7 @@ msgstr ""
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr ""
@@ -52565,8 +52689,8 @@ 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr ""
@@ -53113,16 +53237,16 @@ msgstr ""
msgid "System will notify to increase or decrease quantity or amount "
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr ""
@@ -53139,7 +53263,7 @@ msgstr ""
msgid "TDS Payable"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr ""
@@ -53695,7 +53819,7 @@ msgstr ""
msgid "Tax Withheld Vouchers"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr ""
@@ -54320,7 +54444,7 @@ msgstr ""
msgid "The BOM which will be replaced"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr ""
@@ -54348,7 +54472,7 @@ msgstr ""
msgid "The Loyalty Program isn't valid for the selected company"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr ""
@@ -54372,7 +54496,7 @@ msgstr ""
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr ""
@@ -54394,7 +54518,7 @@ msgstr ""
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr ""
@@ -54435,7 +54559,7 @@ msgstr ""
msgid "The field To Shareholder cannot be blank"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr ""
@@ -54451,7 +54575,7 @@ msgstr ""
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr ""
@@ -54712,6 +54836,10 @@ msgstr ""
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr ""
@@ -54978,7 +55106,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr ""
@@ -54986,7 +55114,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr ""
@@ -55761,6 +55889,10 @@ msgstr ""
msgid "To merge, following properties must be same for both items"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr ""
@@ -55778,7 +55910,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr ""
@@ -56000,7 +56132,7 @@ msgstr ""
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56162,7 +56294,7 @@ msgstr ""
msgid "Total Debit"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr ""
@@ -56755,6 +56887,10 @@ msgstr ""
msgid "Traceability"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr ""
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56795,7 +56931,7 @@ msgstr ""
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -56893,7 +57029,7 @@ msgstr ""
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr ""
@@ -56915,7 +57051,7 @@ msgstr ""
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57512,7 +57648,11 @@ msgstr ""
msgid "Unassigned Qty"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr ""
@@ -58879,7 +59019,7 @@ msgstr ""
msgid "Vendor Invoices"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr ""
@@ -58946,7 +59086,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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59137,11 +59277,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59176,7 +59316,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr ""
@@ -59208,9 +59348,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59229,6 +59369,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_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
@@ -59438,6 +59579,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_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
@@ -59546,7 +59688,7 @@ msgstr ""
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr ""
@@ -59559,7 +59701,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:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr ""
@@ -59710,7 +59852,7 @@ msgstr ""
msgid "Warning!"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr ""
@@ -60193,6 +60335,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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr ""
@@ -60668,7 +60811,7 @@ msgstr ""
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr ""
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr ""
@@ -60700,7 +60843,7 @@ msgstr ""
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr ""
@@ -60717,7 +60860,7 @@ msgstr ""
msgid "You can only select one mode of payment as default"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr ""
@@ -60749,11 +60892,11 @@ msgstr ""
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr ""
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr ""
@@ -60769,7 +60912,7 @@ msgstr ""
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr ""
@@ -60801,7 +60944,7 @@ msgstr ""
msgid "You don't have enough Loyalty Points to redeem"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr ""
@@ -61227,7 +61370,7 @@ msgstr ""
msgid "to"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr ""
@@ -61267,7 +61410,7 @@ msgstr ""
msgid "{0} '{1}' is disabled"
msgstr ""
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr ""
@@ -61299,7 +61442,7 @@ msgstr ""
msgid "{0} Digest"
msgstr ""
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr ""
@@ -61315,7 +61458,7 @@ msgstr ""
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr ""
@@ -61331,19 +61474,19 @@ msgstr ""
msgid "{0} account not found while submitting purchase receipt"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr ""
@@ -61351,7 +61494,7 @@ msgstr ""
msgid "{0} already has a Parent Procedure {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr ""
@@ -61410,7 +61553,7 @@ msgstr ""
msgid "{0} entered twice {1} in Item Taxes"
msgstr ""
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr ""
@@ -61463,7 +61606,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr ""
@@ -61538,7 +61681,7 @@ msgstr ""
msgid "{0} must be negative in return document"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr ""
@@ -61554,7 +61697,7 @@ msgstr ""
msgid "{0} payment entries can not be filtered by {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr ""
@@ -61615,7 +61758,7 @@ msgstr ""
msgid "{0} {1} Manually"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr ""
@@ -61680,7 +61823,7 @@ msgstr ""
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr ""
@@ -61692,7 +61835,7 @@ msgstr ""
msgid "{0} {1} is frozen"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr ""
@@ -61704,12 +61847,12 @@ msgstr ""
msgid "{0} {1} is not associated with {2} {3}"
msgstr ""
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr ""
@@ -61721,7 +61864,7 @@ msgstr ""
msgid "{0} {1} must be submitted"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr ""
@@ -61756,7 +61899,7 @@ msgstr ""
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr ""
@@ -61834,7 +61977,7 @@ msgstr "{doctype} {name} отменено или закрыто."
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr ""
@@ -61842,7 +61985,7 @@ msgstr ""
msgid "{ref_doctype} {ref_name} is {status}."
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr ""
@@ -61900,7 +62043,7 @@ msgstr ""
msgid "{} To Bill"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr ""
diff --git a/erpnext/locale/sr.po b/erpnext/locale/sr.po
index 280b1083d5c..c352ecdfcf3 100644
--- a/erpnext/locale/sr.po
+++ b/erpnext/locale/sr.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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-09 16:53\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:06\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Serbian (Cyrillic)\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr " Ставка"
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr "'Дани од последње наруџбине' морају бит
msgid "'Default {0} Account' in Company {1}"
msgstr "'Подразумевани {0} рачун' у компанији {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr "'Уноси' не могу бити празни"
@@ -919,11 +919,11 @@ msgstr "Ваше пречице\n"
msgid "Your Shortcuts"
msgstr "Ваше пречице"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr "Укупан износ: {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr "Неизмирени износ: {0}"
@@ -1319,10 +1319,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1627,7 +1627,7 @@ msgstr "Рачун {0}: Матични рачун {1} не постоји"
msgid "Account {0}: You can not assign itself as parent account"
msgstr "Рачун {0}: Не може се самопоставити као матични рачун"
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr "Рачун: {0} је недовршени капитал у раду и не може се ажурирати кроз налог књижења"
@@ -2116,7 +2116,7 @@ msgstr "Рачуни су закључани до датума"
msgid "Accounts Manager"
msgstr "Accounts Manager"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr "Грешка због недостајућег рачуна"
@@ -2303,7 +2303,7 @@ msgstr "Подешавање рачуна"
msgid "Accounts User"
msgstr "Књиговођа"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr "Табела рачуна не може бити празна."
@@ -2663,6 +2663,10 @@ msgstr "Стварно време завршетка"
msgid "Actual Expense"
msgstr "Стварни трошак"
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr "Стварни трошкови"
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2800,7 +2804,7 @@ msgstr "Додај / Измени цене"
msgid "Add Child"
msgstr "Додај зависни елемент"
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr "Додај колоне у валути трансакције"
@@ -3606,7 +3610,7 @@ msgstr "Износ аванса"
msgid "Advance amount cannot be greater than {0} {1}"
msgstr "Износ аванса не може бити већи од {0} {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr "Износ плаћеног аванса {0} {1} не може бити већи од {2}"
@@ -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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr "Против рачуна"
@@ -3732,7 +3736,7 @@ msgstr "Против рачуна расхода"
msgid "Against Income Account"
msgstr "Против рачуна прихода"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr "Против налог књижења {0} не постоји ниједан неусклађени унос {1}"
@@ -3780,7 +3784,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr "Против документа"
@@ -3792,7 +3796,7 @@ msgstr "Против документа"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr "Против броја документа"
@@ -3804,8 +3808,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr "Против врсте документа"
@@ -3931,7 +3935,7 @@ msgstr "Све"
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr "Сви налози"
@@ -4099,7 +4103,7 @@ msgstr "Све ставке су већ захтеване"
msgid "All items have already been Invoiced/Returned"
msgstr "Све ставке су већ фактурисане/враћене"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
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 "Све потребне ставке (сировине) биће преузете из саставнице и попуњене у овој табели. Овде можете такође променити изворно складиште за било коју ставку. Током производње, можете пратити пренесене сировине из ове табеле."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr "Све ове ставке су већ фактурисане/враћене"
@@ -5011,7 +5015,7 @@ msgstr "Измењено из"
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5151,7 +5155,7 @@ msgstr "Износ у цифрама"
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr "Износ у валути рачуна"
@@ -5302,7 +5306,7 @@ msgstr "Већ постоји други буџетски запис '{0}' у в
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr "Већ постоји други запис о расподели трошковног центра {0} који важи од {1}, стога ће ова расподела важити до {2}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr "Други захтев за наплату се већ обрађује"
@@ -5448,11 +5452,11 @@ msgstr "Примењена шифра купона"
#. Inspection Reading'
#: erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
msgid "Applied on each reading."
-msgstr "Примени на свако очитавање."
+msgstr "Примењено на свако очитавање."
#: erpnext/stock/doctype/putaway_rule/putaway_rule.py:183
msgid "Applied putaway rules."
-msgstr "Примени правила складиштења."
+msgstr "Примењена правила складиштења."
#. Label of the applies_to (Table) field in DocType 'Common Code'
#: erpnext/edi/doctype/common_code/common_code.json
@@ -5885,7 +5889,7 @@ msgstr "Ставка залиха за капитализацију имовин
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5927,7 +5931,7 @@ msgstr "Распоред амортизације имовине"
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr "Распоред амортизације за имовину {0} и финансијску евиденцију {1} не користи амортизацију засновану на сменама"
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr "Распоред амортизације није пронађен за имовину {0} и финансијску евиденцију {1}"
@@ -5966,7 +5970,7 @@ msgstr "Отуђење имовине"
msgid "Asset Finance Book"
msgstr "Финансијска евиденција имовине"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr "ИД имовине"
@@ -6042,7 +6046,7 @@ msgstr "Евиденција кретања имовине {0} је креира
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr "Назив имовине"
@@ -6128,9 +6132,9 @@ msgstr "Статус имовине"
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr "Вредност имовине"
@@ -6159,7 +6163,7 @@ msgstr "Имовина отказана"
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "Имовина не може бити отказана, јер је већ {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr "Имовина не може бити отписана пре последњег уноса амортизације."
@@ -6191,7 +6195,7 @@ msgstr "Имовина је ван функције због поправке и
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr "Имовина примљена на локацији {0} и дата запосленом лицу {1}"
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr "Имовина враћена у претходно стање"
@@ -6203,11 +6207,11 @@ msgstr "Имовина је враћена у претходно стање на
msgid "Asset returned"
msgstr "Имовина враћена"
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr "Отписана имовина"
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr "Имовина је отписана путем налога књижења {0}"
@@ -6232,7 +6236,7 @@ msgstr "Имовина ажурирана након што је подељен
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr "Имовина је ажурирана због поправке имовине {0} {1}."
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr "Имовина {0} не може бити отписана, јер је већ {1}"
@@ -6265,7 +6269,15 @@ msgstr "Имовина {0} је ажурирана. Молимо Вас да п
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr "Имовина {0} је у статусу {1} и не може бити поправљена."
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr "Имовина {0} није подешена за обрачун амортизације."
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr "Имовина {0} није поднета. Молимо Вас да поднесете имовину пре наставка."
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr "Имовина {0} мора бити поднета"
@@ -6646,7 +6658,7 @@ msgstr "Аутоматско усклађивање"
msgid "Auto Reconcile Payments"
msgstr "Аутоматско усклађивање уплата"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr "Аутоматско усклађивање"
@@ -6656,7 +6668,7 @@ msgstr "Аутоматско усклађивање"
msgid "Auto Reconciliation Job Trigger"
msgstr "Аутоматско усклађивање задатака"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr "Аутоматско усклађивање је започето у позадини"
@@ -6831,7 +6843,7 @@ msgstr "Доступна количина шарже у складишту"
msgid "Available Batch Report"
msgstr "Извештај о доступним ставкама шарже"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr "Датум доступности за употребу"
@@ -7060,7 +7072,7 @@ msgstr "Саставница"
msgid "BOM 1"
msgstr "Саставница 1"
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "Саставница 1 {0} и саставница 2 {1} не би требале да буду исте"
@@ -7298,23 +7310,23 @@ msgstr "Саставница не садржи ниједну ставку за
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr "Рекурзија саставнице: {0} не може проистећи из {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr "Рекурзија саставнице: {1} не може бити матична или зависна за {0}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr "Саставница {0} не припада ставци {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr "Саставница {0} мора бити активна"
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr "Саставница {0} мора бити поднета"
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr "Саставница {0} није пронађена за ставку {1}"
@@ -7385,7 +7397,7 @@ msgstr "Стање"
msgid "Balance (Dr - Cr)"
msgstr "Стање (Д - П)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr "Стање ({0})"
@@ -7864,7 +7876,7 @@ msgstr "Основна цена"
msgid "Base Tax Withholding Net Total"
msgstr "Основни износ пореза по одбитку (нето укупно)"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr "Укупно основа"
@@ -8069,7 +8081,9 @@ msgstr "Статус истека ставке шарже"
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -8080,7 +8094,7 @@ msgstr "Број шарже"
msgid "Batch No is mandatory"
msgstr "Број шарже је обавезан"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr "Број шарже {0} не постоји"
@@ -8103,7 +8117,7 @@ msgstr "Број шарже."
msgid "Batch Nos"
msgstr "Бројеви шарже"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr "Бројеви шарже су успешно креирани"
@@ -8116,7 +8130,7 @@ msgstr "Шаржа није доступна за поврат"
msgid "Batch Number Series"
msgstr "Бројчана серија шарже"
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr "Количина шарже"
@@ -8229,7 +8243,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8542,8 +8556,8 @@ msgstr "Ставка оквирне наруџбине"
msgid "Blanket Order Rate"
msgstr "Цена оквирне наруџине"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr "Блокирати фактуру"
@@ -8659,7 +8673,7 @@ msgstr "Уписано основно средство"
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr "Књиговодствена вредност залиха преко више рачуна отежаће праћење залиха и вредности по рачуну."
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr "Књиге су затворене до периода који се завршава {0}"
@@ -9433,7 +9447,7 @@ msgstr "Не може се филтрирати према методи плаћ
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr "Не може се филтрирати према броју документа, уколико је груписано по документу"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr "Може се извршити плаћање само за неизмирене {0}"
@@ -9619,7 +9633,7 @@ msgstr "Не може се оптимизовати рута јер недост
msgid "Cannot Relieve Employee"
msgstr "Не може се отпустити запослено лице"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr "Није могуће поново поднети унос за документе који припадају фискалној години која је затворена."
@@ -9635,6 +9649,10 @@ msgstr "Не може се применити порез одбијен на и
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr "Не може бити основно средство јер је креирана књига залиха."
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr "Није могуће отказати распоред амортизације имовине {0} јер постоји нацрт налога књижења {1}."
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr "Није могуће отказати унос затварања малопродаје"
@@ -9724,7 +9742,7 @@ msgstr "Није могуће креирати поврат за консоли
msgid "Cannot create root account."
msgstr "Није могуће креирати основни рачун."
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr "Не може се деактивирати или отказати саставница јер је повезана са другим саставницама"
@@ -9741,7 +9759,7 @@ msgstr "Не може се одбити када је категорија за
msgid "Cannot delete Exchange Gain/Loss row"
msgstr "Не може се обрисати ред прихода/расхода курсних разлика"
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr "Не може се обрисати број серије {0}, јер се користи у трансакцијама са залихама"
@@ -10187,11 +10205,11 @@ msgstr "Ланац"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr "Промена инзноса"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr "Промена датума објаљивања"
@@ -10204,7 +10222,7 @@ msgstr "Промена датума објаљивања"
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr "Промена вредности залиха"
@@ -11012,6 +11030,7 @@ msgstr "Компаније"
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11159,6 +11178,7 @@ msgstr "Компаније"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11244,8 +11264,8 @@ msgstr "Компаније"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11561,7 +11581,7 @@ msgstr "ПИБ компаније"
msgid "Company and Posting Date is mandatory"
msgstr "Компанија и датум књижења су обавезни"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr "Валуте оба предузећа морају бити исте за међукомпанијске трансакције."
@@ -12842,7 +12862,7 @@ 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12861,7 +12881,7 @@ msgstr "Трошак"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -13074,7 +13094,7 @@ msgstr "Није могуће обрисати демо податке"
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr "Није могуће аутоматски креирати купца због следећих недостајућих обавезних поља:"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr "Није могуће аутоматски креирати документ о смањењу, поништите означавање опције 'Издај документ о смањењу' и поново пошаљите"
@@ -13197,15 +13217,15 @@ msgstr "Потражује"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13447,7 +13467,7 @@ msgstr "Креирај прилику"
msgid "Create POS Opening Entry"
msgstr "Креирај унос почетног стања малопродаје"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr "Креирај унос уплате"
@@ -13603,7 +13623,7 @@ msgstr "Креирање рачуна..."
msgid "Creating Delivery Note ..."
msgstr "Креирање отпремнице..."
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr "Креирање димензија..."
@@ -13623,7 +13643,7 @@ msgstr "Креирање улазних фактура …"
msgid "Creating Purchase Order ..."
msgstr "Креирање набавне поруџбине ..."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13660,11 +13680,6 @@ msgstr "Креирање {} од {} {}"
msgid "Creation"
msgstr "Креирање"
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr "Број документа креирања"
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr "Креирање {1}(s) успешно"
@@ -13699,11 +13714,11 @@ msgstr "Креирање {0} делимично успешно.\n"
msgid "Credit"
msgstr "Потражује"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr "Потражује (Трансакција)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr "Потражује ({0})"
@@ -13846,7 +13861,7 @@ 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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr "Документ о смањењу {0} је аутоматски креиран"
@@ -13930,7 +13945,7 @@ msgstr "Интервал Cron задатка треба да буде измеђ
#. Description of a DocType
#: erpnext/setup/doctype/website_item_group/website_item_group.json
msgid "Cross Listing of Item in multiple groups"
-msgstr "Прекршено листање ставки у више група"
+msgstr "Унакрсно навођење ставки у више група"
#. Name of a UOM
#: erpnext/setup/setup_wizard/data/uom_data.json
@@ -14054,7 +14069,7 @@ msgstr "Шоља"
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14153,7 +14168,7 @@ msgstr "Валута не може бити промењена након што
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr "Валута за {0} мора бити {1}"
@@ -14503,6 +14518,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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14530,6 +14546,10 @@ msgstr "Купац / Ставка / Група ставки"
msgid "Customer / Lead Address"
msgstr "Адреса купца / потенцијалног купца"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr "Купац > Група купаца > Територија"
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14931,7 +14951,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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr "Купац {0} не припада пројекту {1}"
@@ -15283,7 +15303,7 @@ msgstr "Датум издавања"
msgid "Date of Joining"
msgstr "Датум придруживања"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr "Датум трансакције"
@@ -15420,11 +15440,11 @@ msgstr "Поштовани менаџеру система,"
msgid "Debit"
msgstr "Дугује"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr "Дугује (Трансакција)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr "Дугује ({0})"
@@ -15498,7 +15518,7 @@ msgstr "Дугује према"
msgid "Debit To is required"
msgstr "Дугује према је обавезно"
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr "Дугује и потражује нису у равнотежи за {0} #{1}. Разлика је {2}."
@@ -16565,7 +16585,7 @@ msgstr "Демо подаци обрисани"
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16640,9 +16660,9 @@ msgstr "Амортизовати на основу дневне пропорци
msgid "Depreciate based on shifts"
msgstr "Амортизовани на основу смене"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr "Амортизована сума"
@@ -16698,6 +16718,14 @@ msgstr "Унос амортизације"
msgid "Depreciation Entry Posting Status"
msgstr "Статус књижења уноса амортизације"
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr "Унос амортизације за имовину {0}"
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr "Унос амортизације за {0} у вредности од {1}"
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16706,7 +16734,7 @@ msgstr "Статус књижења уноса амортизације"
msgid "Depreciation Expense Account"
msgstr "Рачун за трошак амортизације"
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr "Рачун за трошак амортизације мора бити рачун прихода или расхода."
@@ -17592,6 +17620,10 @@ msgstr "Датум попуста"
msgid "Discount Percentage"
msgstr "Проценат попуста"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr "Проценат попуста може се применити или на један ценовник или на све ценовнике."
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr "Проценат попуста у трансакцији"
@@ -17824,7 +17856,7 @@ msgstr "Поставке отпреме"
msgid "Disposal Date"
msgstr "Датум отуђења"
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr "Датум отуђења {0} не може бити пре {1} датума {2} за имовину."
@@ -18104,7 +18136,7 @@ msgstr "Документи"
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr "Документи обрађени при сваком окидачу. Величина реда треба да буде између 5 и 100"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr "Документи: {0} имају омогућене разграничене приходе/трошкове. Не могу се поново књижити."
@@ -19143,7 +19175,7 @@ msgstr "Празно"
msgid "Ems(Pica)"
msgstr "Ems (Pica)"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr "Омогућите дозволу за делимичну резервацију у поставкама залиха како бисте резервисали делимичне залихе."
@@ -19494,7 +19526,7 @@ msgstr "Унесите назив за операцију, на пример, С
msgid "Enter a name for this Holiday List."
msgstr "Унесите назив за ову листу празника."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr "Унесите износ који желите да искористите."
@@ -19556,7 +19588,7 @@ msgstr "Унесите количину ставки која ће бити пр
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr "Унесите количину за производњу. Ставке сировине ће бити преузете само уколико је ово постављено."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr "Унесите износ за {0}."
@@ -19576,7 +19608,7 @@ msgid "Entity"
msgstr "Ентитет"
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19671,7 +19703,7 @@ msgstr "Грешка приликом евалуације формуле кри
msgid "Error in party matching for Bank Transaction {0}"
msgstr "Грешка у усклађивању странке за банковну трансакцију {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr "Грешка приликом књижења амортизације"
@@ -19723,11 +19755,9 @@ msgstr "Процена времена и трошкова"
msgid "Evaluation Period"
msgstr "Период евалуације"
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
-msgstr "Чак и фактуре код којих порез по одбитку није означен ће бити узете у обзир приликом провере прекорачења кумулативног прага"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
+msgstr "Чак и уколико постоје више ценовних правила са највишим приоритетом, примењују се следећи интерни приоритети:"
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
@@ -20089,7 +20119,7 @@ msgstr "Очекивана вредност након корисног века
msgid "Expense"
msgstr "Трошак"
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr "Рачун расхода / разлике ({0}) мора бити рачун врсте 'Добитак или губитак'"
@@ -20134,7 +20164,7 @@ msgstr "Рачун расхода / разлике ({0}) мора бити ра
msgid "Expense Account"
msgstr "Рачун расхода"
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr "Недостаје рачун расхода"
@@ -20441,7 +20471,7 @@ msgstr "Датум неуспеха"
msgid "Failure Description"
msgstr "Опис неуспеха"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr "Неуспех: {0}"
@@ -21117,6 +21147,10 @@ msgstr "Основно средство мора бити ставка ван з
msgid "Fixed Asset Register"
msgstr "Регистар основних средстава"
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr "Основно средство {0} се не може користити у саставницама."
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21247,7 +21281,7 @@ msgstr "За подразумеваног добављача (опционо)"
msgid "For Item"
msgstr "За ставку"
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr "За ставку {0} количина не може бити примљена у већој количини од {1} у односу на {2} {3}"
@@ -22139,7 +22173,7 @@ msgstr "Референца будућег плаћања"
msgid "Future Payments"
msgstr "Будућа плаћања"
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr "Будући датум није дозвољен"
@@ -22155,7 +22189,7 @@ msgstr "Стање главне књиге"
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr "Унос у главну књигу"
@@ -22421,8 +22455,8 @@ msgid "Get Items"
msgstr "Прикажи ставке"
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22781,7 +22815,7 @@ msgstr "Грам/Литар"
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22791,7 +22825,7 @@ msgstr "Грам/Литар"
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22912,8 +22946,8 @@ msgstr "Проценат бруто профита"
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr "Укупан износ набавке"
@@ -23264,7 +23298,7 @@ msgstr "Хектопаскал"
msgid "Height (cm)"
msgstr "Висина (цм)"
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr "Здраво,"
@@ -23303,7 +23337,7 @@ msgstr "Текст помоћи"
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr "Помаже Вам да расподелите буџет/циљ по месецима ако имате сезоналност у пословању."
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr "Ово су евиденције грешака за претходно неуспеле уносе амортизације: {0}"
@@ -23399,7 +23433,7 @@ msgstr "Стави на чекање"
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr "Стави фактуру на чекање"
@@ -23493,6 +23527,10 @@ msgstr "Часови"
msgid "Hours Spent"
msgstr "Утрошени часови"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr "На који начин се примењује ценовно правило?"
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23833,6 +23871,10 @@ msgstr "Уколико је наведено, систем ће омогућит
msgid "If more than one package of the same type (for print)"
msgstr "Уколико има више од једног паковања исте врсте (за штампу)"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr "Уколико више ценовних правила настављају да важе, корисник треба ручно да постави приоритет ради решавања конфликта."
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23849,6 +23891,10 @@ msgstr "Уколико није, можете отказати/ поднети
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr "Уколико је цена нула, ставке ће се третирати као \"Бесплатна ставка\""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr "Уколико је изабрано ценовно правило направљено за 'Јединична цена' оно ће заменити ценовник. Цена из ценовног правила је коначна цена, у складу са тим не би требало примењивати додатно снижење. Због тога ће се у трансакцијама попут продајне поруџбине, набавне поруџбине и слично, вредности узимати из поља 'Јединична цена', а не из поља 'Основна цена у ценовнику'."
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23931,6 +23977,10 @@ msgstr "Уколико је означено, више материјала мо
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr "Уколико је означено, цене из саставница ће се аутоматски ажурирати на основу стопе вредновања / ценовника / последње набавке сировина."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr "Уколико се на основу горе наведених услова пронађу два или више ценовних правила, примењује се приоритет. Приоритет је број од 0 до 20, при чему је подразумевана вредност нула (празно). Виши број значи да ће то правило имати предност уколико постоје више ценовних правила са истим условима."
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr "Уколико лојалти поени немају ограничени рок трајања, оставите поље рока трајања као празно или унесите 0."
@@ -24025,7 +24075,7 @@ msgstr "Игнориши празне залихе"
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr "Игнориши ревалоризацију девизног курса и дневнике прихода/расхода"
@@ -24077,7 +24127,7 @@ msgstr "Правило о ценама је омогућено. Није мог
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr "Игнориши дуговне/потражне белешке генерисане од стране система"
@@ -24840,7 +24890,7 @@ msgstr "Поставке долазних позива"
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24913,7 +24963,7 @@ msgstr "Нетачни пакети серија и шаржи"
msgid "Incorrect Stock Value Report"
msgstr "Извештај о нетачној вредности залиха"
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr "Нетачан врста трансакције"
@@ -25080,13 +25130,13 @@ msgstr "Унесите нове записе"
msgid "Inspected By"
msgstr "Инспекцију извршио"
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr "Инспекција одбијена"
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr "Инспекција је потребна"
@@ -25103,7 +25153,7 @@ msgstr "Инспекција је потребна пре испоруке"
msgid "Inspection Required before Purchase"
msgstr "Инспекција је потребна пре набавке"
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr "Подношење инспекције"
@@ -25133,7 +25183,7 @@ msgstr "Напомена о инсталацији"
msgid "Installation Note Item"
msgstr "Ставка у напомени о инсталацији"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr "Напомена о инсталацији {0} је већ поднета"
@@ -25191,7 +25241,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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "Недовољно залиха"
@@ -25382,7 +25432,7 @@ msgstr "Интерни трансфери"
msgid "Internal Work History"
msgstr "Интерна радна историја"
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr "Интерни трансфери могу се обавити само у основној валути компаније"
@@ -25418,7 +25468,7 @@ msgid "Invalid Account"
msgstr "Неважећи рачун"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr "Неважећи распоређени износ"
@@ -25446,7 +25496,7 @@ msgstr "Неважећа оквирна наруџбина за изабрано
msgid "Invalid Child Procedure"
msgstr "Неважећа зависна процедура"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr "Неважећа компанија за међукомпанијску трансакцију."
@@ -25504,7 +25554,7 @@ msgid "Invalid Ledger Entries"
msgstr "Неважећи рачуноводствени уноси"
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr "Неважећи унос почетног стања"
@@ -25532,7 +25582,7 @@ msgstr "Неважећа примарна улога"
msgid "Invalid Priority"
msgstr "Неважећи приоритет"
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr "Неважећа конфигурација губитака у процесу"
@@ -25616,8 +25666,8 @@ msgstr "Неважећи упит претраге"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr "Неважећа вредност {0} за {1} у односу на рачун {2}"
@@ -25625,7 +25675,7 @@ msgstr "Неважећа вредност {0} за {1} у односу на ра
msgid "Invalid {0}"
msgstr "Неважеће {0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr "Неважеће {0} за међукомпанијску трансакцију."
@@ -25835,7 +25885,7 @@ msgstr "Фактурисана количина"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26887,6 +26937,8 @@ msgstr "Корпа ставке"
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26905,7 +26957,11 @@ msgstr "Шифра ставке"
msgid "Item Code (Final Product)"
msgstr "Шифра ставке (финални производ)"
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr "Шифра ставке > Група ставки > Бренд"
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr "Шифра ставке не може бити промењена за број серије."
@@ -27309,6 +27365,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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28229,7 +28286,7 @@ msgstr "Налог књижења за отпис"
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr "Врста налога књижења треба да буде постављена на унос амортизације за амортизацију имовине"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr "Налог књижења {0} нема рачун {1} или је већ усклађен са другим документом"
@@ -28435,7 +28492,7 @@ msgstr "Фактура добављача за трошкове набавке"
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29152,7 +29209,7 @@ msgstr "Локално"
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29823,7 +29880,7 @@ msgstr "Обавезна рачуноводствена димензија"
msgid "Mandatory Depends On"
msgstr "Обавезно зависи од"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr "Обавезно поље"
@@ -29913,6 +29970,7 @@ msgstr "Ручно уношење не може бити креирано! Он
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30471,6 +30529,7 @@ msgid "Material Requested"
msgstr "Затражени материјал"
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr "Захтеви за набавку"
@@ -30826,7 +30885,7 @@ msgstr "Порука"
msgid "Message Examples"
msgstr "Примери порука"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr "Порука послата"
@@ -31140,8 +31199,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr "Недостајући рачун"
@@ -31159,6 +31218,10 @@ msgstr "Недостајући трошковни центар"
msgid "Missing Default in Company"
msgstr "Недостаје подразумевана поставка у компанији"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr "Недостају филтери"
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr "Недостајућа финансијска евиденција"
@@ -31191,7 +31254,7 @@ msgstr "Недостају обавезне вредности"
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr "Недостаје имејл шаблон за слање. Молимо Вас да га поставите у подешавањима испоруке."
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr "Недостајућа вредност"
@@ -31857,7 +31920,7 @@ msgstr "Природни гас"
msgid "Needs Analysis"
msgstr "Анализа потребна"
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr "Негативна количина шарже"
@@ -32289,7 +32352,7 @@ msgstr "Нове продајне поруџбине"
msgid "New Sales Person Name"
msgstr "Име новог продавца"
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr "Нови број серије не може имати складиште. Складиште мора бити постављено путем уноса залиха или кроз пријемницу набавке"
@@ -32325,7 +32388,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:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr "Нови датум објављивања мора бити у будућности"
@@ -32434,7 +32497,7 @@ msgstr "Без радње"
msgid "No Answer"
msgstr "Нема одговора"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr "Није пронађен купац за међукомпанијске трансакције који представљају компанију {0}"
@@ -32491,9 +32554,9 @@ msgstr "Нису пронађене неизмирене фактуре за о
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr "Не постоји профил малопродаје. Молимо Вас да креирате нови профил малопродаје"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr "Без дозволе"
@@ -32528,7 +32591,7 @@ msgstr "Тренутно нема доступних залиха"
msgid "No Summary"
msgstr "Нема резимеа"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr "Нема добављача за међукомпанијске трансакције који представља компанију {0}"
@@ -32626,7 +32689,7 @@ msgstr "Нема ставки у корпи"
msgid "No items to be received are overdue"
msgstr "Нема ставки за пријем које су закасниле"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr "Нема поклапања путем аутоматског усклађивања"
@@ -32760,11 +32823,11 @@ msgstr "Није пронађена трансакција залиха које
msgid "No values"
msgstr "Без вредности"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr "Не постоји рачун {0} за ову компанију."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr "Нема {0} за међукомпанијске трансакције."
@@ -32799,7 +32862,7 @@ msgstr "Категорија неподложна амортизацији"
msgid "Non Profit"
msgstr "Непрофитно"
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr "Ставке ван залиха"
@@ -32978,7 +33041,7 @@ msgstr "Напомена: Датум доспећа премашује дозв
msgid "Note: Email will not be sent to disabled users"
msgstr "Напомена: Имејл неће бити послат онемогућеним корисницима"
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr "Напомена: Уколико желите да користите готов производ {0} као сировину, омогућите опцију 'Не рашчлањуј' у табели ставки против те сировине."
@@ -32998,7 +33061,7 @@ msgstr "Напомена: Овај трошковни центар је груп
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr "Напомена: Да бисте спојили ставке, креирајте засебно усклађивање залиха за старију ставку {0}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr "Напомена: {0}"
@@ -33014,6 +33077,7 @@ msgstr "Напомена: {0}"
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33449,6 +33513,12 @@ msgstr "Само су независни чворови дозвољени у т
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr "Може се креирати само један {0} унос против радног налога {1}"
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr "Искључиво уноси уплате код којих опција за примену пореза по одбитку није означена биће узета у обзир приликом провере прекорачења кумулативног прага"
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33651,8 +33721,8 @@ msgstr "Почетно стање (Дугује)"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr "Почетна акумулирана амортизација"
@@ -33694,7 +33764,7 @@ msgstr "Почетни датум"
msgid "Opening Entry"
msgstr "Унос почетног стања"
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr "Унос почетног стања не може бити креиран након што је креиран документ за затварање периода."
@@ -33722,7 +33792,7 @@ msgid "Opening Invoice Item"
msgstr "Ставка почетне фактуре"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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}' да не поставите никакво прилагођавање за заокруживање."
@@ -33796,7 +33866,7 @@ msgstr "Оперативни трошак (валута компаније)"
msgid "Operating Cost Per BOM Quantity"
msgstr "Оперативни трошак према количини у саставници"
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr "Оперативни трошак према радном налогу / саставници"
@@ -33952,7 +34022,7 @@ msgstr "Операције"
msgid "Operations Routing"
msgstr "Распоред операција"
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr "Поље за операције не може остати празно"
@@ -34544,7 +34614,7 @@ msgstr "Дозвола за прекорачење испоруке/пријем
msgid "Over Picking Allowance"
msgstr "Дозвола за преузимање вишка"
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr "Прекорачење пријема"
@@ -34996,7 +35066,7 @@ msgstr "Упакована ставка"
msgid "Packed Items"
msgstr "Упаковане ставке"
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr "Упаковане ставке не могу бити део интерног преноса"
@@ -35031,7 +35101,7 @@ msgstr "Документ листе паковања"
msgid "Packing Slip Item"
msgstr "Ставка на документу листе паковања"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr "Документ(а) листе паковања је отказан"
@@ -35117,7 +35187,7 @@ msgstr "Плаћено"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35392,7 +35462,7 @@ msgstr "Делимично пренесен материјал"
msgid "Partial Payment in POS Transactions are not allowed."
msgstr "Делимично плаћање у малопродајним трансакцијама није дозвољено."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr "Делимична резервација залиха"
@@ -35586,9 +35656,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35749,9 +35819,9 @@ 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35916,7 +35986,7 @@ msgstr "Подешавање платиоца"
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -36052,7 +36122,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr "Унос уплате је измењен након што сте га повукли. Молимо Вас да га поново повучете."
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr "Уноћ уплате је већ креиран"
@@ -36261,7 +36331,7 @@ msgstr "Референце плаћања"
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36287,11 +36357,11 @@ msgstr "Врста захтева за наплату"
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr "Захтев за наплату је креиран из продајне или набавне поруџбине и биће у статусу нацрта. Када се онемогући, документ ће бити у несачуваном статусу."
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr "Захтев за наплату за {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr "Захтев за наплату је већ креиран"
@@ -36449,7 +36519,7 @@ msgstr "URL плаћања"
msgid "Payment Unlink Error"
msgstr "Грешка приликом поништавања плаћања"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr "Плаћање против {0} {1} не може бити већи од неизмиреног износа {2}"
@@ -36770,7 +36840,7 @@ msgstr "Период"
msgid "Period Based On"
msgstr "Период заснован на"
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr "Период затворен"
@@ -37373,7 +37443,7 @@ msgstr "Молимо Вас да додате рачун за основни н
msgid "Please add {1} role to user {0}."
msgstr "Молимо Вас да додате улогу {1} кориснику {0}."
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr "Молимо Вас да прилагодите количину или измените {0} за наставак."
@@ -37381,7 +37451,7 @@ msgstr "Молимо Вас да прилагодите количину или
msgid "Please attach CSV file"
msgstr "Молимо Вас да приложите CSV фајл"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr "Молимо Вас да откажете и измените унос уплате"
@@ -37394,7 +37464,7 @@ msgstr "Молимо Вас да прво ручно откажете унос
msgid "Please cancel related transaction."
msgstr "Молимо Вас да откажете повезану трансакцију."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr "Молимо Вас да проверите опцију за више валута да бисте омогућили рачуне са другим валутама"
@@ -37471,7 +37541,7 @@ msgstr "Молимо Вас да креирате пријемницу наба
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr "Молимо Вас да обришете производну комбинацију {0}, пре него што спојите {1} у {2}"
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr "Молимо Вас да привремено онемогућите радни ток за налог књижења {0}"
@@ -37595,7 +37665,7 @@ msgstr "Молимо Вас да прво унесете пријемницу н
msgid "Please enter Receipt Document"
msgstr "Молимо Вас да унесете документ пријема"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr "Молимо Вас да унесете датум референце"
@@ -37720,8 +37790,8 @@ msgstr "Молимо Вас да се уверите да ли заиста же
msgid "Please mention 'Weight UOM' along with Weight."
msgstr "Молимо Вас да наведете 'Јединица мере за тежину' заједно са тежином."
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr "Молимо Вас да наведете '{0}' у компанији: {1}"
@@ -37849,7 +37919,7 @@ msgstr "Молимо Вас да изаберете датум књижења п
msgid "Please select Posting Date first"
msgstr "Молимо Вас да прво изаберете датум књижења"
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr "Молимо Вас да изаберете ценовник"
@@ -37881,7 +37951,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr "Молимо Вас да изаберете саставницу"
@@ -37971,6 +38041,10 @@ 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
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr "Молимо Вас да изаберете барем један филтер: Шифра ставке, шаржа или број серије."
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr "Молимо Вас да изаберете барем једну ставку да бисте наставили"
@@ -37979,7 +38053,7 @@ msgstr "Молимо Вас да изаберете барем једну ста
msgid "Please select atleast one operation to create Job Card"
msgstr "Молимо Вас да изаберете барем једну операцију за креирање радне картице"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr "Молимо Вас да изаберете исправан рачун"
@@ -38060,15 +38134,15 @@ msgstr "Молимо Вас да прво изаберете {0}"
msgid "Please set 'Apply Additional Discount On'"
msgstr "Молимо Вас да поставите 'Примени додатни попуст на'"
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr "Молимо Вас да поставите 'Трошковни центар амортизације имовине' у компанији {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr "Молимо Вас да поставите 'Рачун приход/расход приликом отуђења имовине' у компанији {0}"
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr "Молимо Вас да поставите '{0}' у компанији: {1}"
@@ -38076,7 +38150,7 @@ msgstr "Молимо Вас да поставите '{0}' у компанији:
msgid "Please set Account"
msgstr "Молимо Вас да поставите рачун"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr "Молимо Вас да поставите рачун за разлику у износу"
@@ -38102,7 +38176,7 @@ msgstr "Молимо Вас да поставите рачуноводствен
msgid "Please set Company"
msgstr "Молимо Вас да поставите компанију"
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr "Молимо Вас да поставите рачун везана за амортизацију у категорији имовине {0} или у компанији {1}"
@@ -38120,7 +38194,7 @@ msgstr "Молимо Вас да поставите фискалниу шифр
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr "Молимо Вас да поставите фискалну шифру за јавну управу '%s'"
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr "Молимо Вас да поставите рачун основних средстава у категорији имовине {0}"
@@ -38183,7 +38257,7 @@ msgstr "Молимо Вас да поставите рачун у складиш
msgid "Please set an Address on the Company '%s'"
msgstr "Молимо Вас да поставите адресу на компанију '%s'"
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr "Молимо Вас да поставите рачун расхода у табелу ставки"
@@ -38199,23 +38273,23 @@ msgstr "Молимо Вас да поставите бар један ред у
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr "Молимо Вас да поставите или пореску или фискалну шифру за компанију {0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr "Молимо Вас да поставите као подразумевано благајну или текући рачун у начину плаћања {0}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr "Молимо Вас да поставите као подразумевано благајну или текући рачун у начину плаћања {}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "Молимо Вас да поставите као подразумевано благајну или текући рачун у начинима плаћања {}"
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr "Молимо Вас да поставите подразумевани рачун прихода/расхода курсних разлика у компанији {}"
@@ -38319,7 +38393,7 @@ msgstr "Молимо Вас да поставите {0} у {1}, исти рач
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr "Молимо Вас да поставите и омогућите групни рачун са врстом рачуна - {0} за компанију {1}"
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr "Молимо Вас да поделите овај имејл са Вашим тимом за подршку како би могли пронаћи и решити проблем."
@@ -38332,7 +38406,7 @@ msgid "Please specify Company"
msgstr "Молимо Вас да прецизирате компанију"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr "Молимо Вас да прецизирате компанију да бисте наставили"
@@ -38505,6 +38579,7 @@ msgstr "Поштански трошкови"
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38539,11 +38614,11 @@ 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38562,6 +38637,7 @@ msgstr "Поштански трошкови"
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38571,6 +38647,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_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
@@ -39136,6 +39213,14 @@ msgstr "Шифра ставке правила за цене"
msgid "Pricing Rule Item Group"
msgstr "Група ставки правила за цене"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr "Ценовно правило се прво бира на основу поља 'Примени на', које може бити ставка, група ставки или бренд."
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr "Ценовно правило је направљено да замени ценовник или дефинише проценат попуста, на основу неких критеријума."
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr "Правило цена {0} је ажурирано"
@@ -39194,6 +39279,10 @@ msgstr "Правило цена {0} је ажурирано"
msgid "Pricing Rules"
msgstr "Ценовна правила"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr "Ценовна правила се даље филтрирају на основу количине."
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39581,7 +39670,7 @@ msgstr "Опис процеса"
msgid "Process Loss"
msgstr "Губитак у процесу"
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr "Проценат губитка у процесу не може бити већи од 100"
@@ -40071,7 +40160,7 @@ msgstr "Напредак (%)"
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40546,7 +40635,7 @@ msgstr "Аналитика набавке"
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr "Датум набавке"
@@ -40702,7 +40791,7 @@ msgstr "Главни менџер за набавку"
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40878,9 +40967,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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41761,6 +41850,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/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
@@ -41877,7 +41967,7 @@ msgstr "Количина не сме бити већа од {0}"
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr "Количина ставки добијена након производње / препаковања од задатих количина сировина"
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr "Потребна количина за ставку {0} у реду {1}"
@@ -42726,7 +42816,7 @@ msgid "Reason"
msgstr "Разлог"
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "Разлог за стављање на чекање"
@@ -43162,7 +43252,7 @@ msgstr "Искористи против"
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr "Искоришћени поени лојалности"
@@ -43294,7 +43384,7 @@ msgstr "Референтни датум"
msgid "Reference"
msgstr "Референца"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr "Референца #{0} од {1}"
@@ -43432,7 +43522,7 @@ msgstr "Назив референце"
msgid "Reference No"
msgstr "Број референце"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr "Број референце и датум референце су обавезни за {0}"
@@ -43440,11 +43530,11 @@ msgstr "Број референце и датум референце су оба
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr "Број референце и датум референце су обавезни за банкарску трансакцију"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr "Број референце је обавезан ако сте унели датум референце"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr "Број референце."
@@ -43558,11 +43648,11 @@ msgstr "Референца: {0}, шифра ставке: {1} и купац: {2}
msgid "References"
msgstr "Референце"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr "Референце за излазне фактуре су непотпуне"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr "Референце за продајне поруџбине су непотпуне"
@@ -43707,8 +43797,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43727,7 +43817,7 @@ msgstr "Датум раздужења"
msgid "Remaining"
msgstr "Преостало"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr "Преостали износ"
@@ -43740,7 +43830,7 @@ msgstr "Преостали салдо"
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr "Напомена"
@@ -43789,7 +43879,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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -44101,7 +44191,7 @@ msgstr "Поновно објављивање ставки у евиденциј
msgid "Repost Status"
msgstr "Статус поновног објављивања"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr "Поновно објављивање је започето у позадини"
@@ -44425,7 +44515,7 @@ msgstr "Поново изаберите, уколико је изабрани к
msgid "Reseller"
msgstr "Препродавац"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr "Поново пошаљите имејл о уплати"
@@ -44894,7 +44984,7 @@ msgstr "Повраћај"
msgid "Return / Credit Note"
msgstr "Повраћај / Документ о смањењу"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr "Повраћај / Документ о повећању"
@@ -45418,12 +45508,12 @@ 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/sales_invoice/sales_invoice.py:1920
+#: 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/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "Ред #{0} (Евиденција плаћања): Износ мора бити позитиван"
@@ -45569,7 +45659,7 @@ msgstr "Ред #{0}: Дупли унос у референцама {1} {2}"
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr "Ред #{0}: Очекивани датум испоруке не може бити пре датума набавне поруџбине"
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr "Ред #{0}: Рачун расхода није постављен за ставку {1}. {2}"
@@ -45593,11 +45683,11 @@ msgstr "Ред #{0}: Готов производ мора бити {1}"
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr "Ред #{0}: Референца за готов производ је обавезна за отписану ставку {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr "Ред #{0}: За {1}, можете изабрати референтни документ само уколико се износ постави на потражну страну рачуна"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr "Ред #{0}: За {1}, можете изабрати референтни документ само уколико се износ постави на дуговну страну рачуна"
@@ -45617,7 +45707,7 @@ msgstr "Ред #{0}: Ставка је додата"
msgid "Row #{0}: Item {1} does not exist"
msgstr "Ред #{0}: Ставка {1} не постоји"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr "Ред #{0}: Ставка {1} је одабрана, молимо Вас да резервишите залихе са листе за одабир."
@@ -45653,7 +45743,7 @@ 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:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr "Ред #{0}: Само {1} је доступно за резервацију за ставку {2}"
@@ -45698,15 +45788,15 @@ msgstr "Ред #{0}: Количина мора бити позитиван бр
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}."
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr "Ред #{0}: Инспекција квалитета је неопходна за ставку {1}"
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr "Ред #{0}: Инспекција квалитета {1} није поднета за ставку: {2}"
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr "Ред #{0}: Инспекција квалитета {1} је одбијена за ставку {2}"
@@ -45715,7 +45805,7 @@ msgstr "Ред #{0}: Инспекција квалитета {1} је одбиј
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "Ред #{0}: Количина за ставку {1} не може бити нула."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr "Ред #{0}: Количина за резервацију за ставку {1} мора бити већа од 0."
@@ -45812,19 +45902,19 @@ msgstr "Ред #{0}: Статус мора бити {1} за дисконтов
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
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:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr "Ред #{0}: Залихе не могу бити резервисане у групном складишту {1}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr "Ред #{0}: Залихе су већ резервисане за ставку {1}."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr "Ред #{0}: Залихе су већ резервисане за ставку {1} у складишту {2}."
@@ -45832,8 +45922,8 @@ msgstr "Ред #{0}: Залихе су већ резервисане за ста
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr "Ред #{0}: Залихе нису доступне за резервацију за ставку {1} у складишту {2}."
@@ -46014,7 +46104,7 @@ msgstr "Ред {0}# ставка {1} није пронађена у табели
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr "Ред {0}: Прихваћена количина и одбијена количина не могу бити нула истовремено."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr "Ред {0}: {1} и врста странке {2} имају различите врсте рачуна"
@@ -46022,11 +46112,11 @@ msgstr "Ред {0}: {1} и врста странке {2} имају разли
msgid "Row {0}: Activity Type is mandatory."
msgstr "Ред {0}: Врста активности је обавезна."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr "Ред {0}: Аванс против купца мора бити на потражној страни"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr "Ред {0}: Аванс против добављача мора бити на дуговној страни"
@@ -46046,7 +46136,7 @@ msgstr "Ред {0}: Пошто је {1} омогућен, сировине не
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr "Ред {0}: Саставница није пронађена за ставку {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr "Ред {0}: Дуговна и потражна страна не могу бити нула"
@@ -46062,7 +46152,7 @@ msgstr "Ред {0}: Трошковни центар {1} не припада ко
msgid "Row {0}: Cost center is required for an item {1}"
msgstr "Ред {0}: Трошковни центар је обавезан за ставку {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr "Ред {0}: Унос потражне стране не може бити повезан са {1}"
@@ -46070,7 +46160,7 @@ msgstr "Ред {0}: Унос потражне стране не може бит
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr "Ред {0}: Валута за саставницу #{1} треба да буде једнака изабраној валути {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr "Ред {0}: Унос дуговне стране не може бити повезан са {1}"
@@ -46086,7 +46176,7 @@ msgstr "Ред {0}: Датум доспећа у табели услова пл
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr "Ред {0}: Ставка из отпремнице или референца упаковане ставке је обавезна."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "Ред {0}: Девизни курс је обавезан"
@@ -46120,7 +46210,7 @@ msgstr "Ред {0}: Време почетка и време завршетка
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr "Ред {0}: Време почетка и време завршетка за {1} се преклапају са {2}"
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr "Ред {0}: Почетно складиште је обавезно за интерне трансфере"
@@ -46132,7 +46222,7 @@ msgstr "Ред {0}: Време почетка мора бити мање од в
msgid "Row {0}: Hours value must be greater than zero."
msgstr "Ред {0}: Вредност часова мора бити већа од нуле."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr "Ред {0}: Неважећа референца {1}"
@@ -46156,7 +46246,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr "Ред {0}: Упакована количина мора бити једнака количини {1}."
@@ -46164,7 +46254,7 @@ msgstr "Ред {0}: Упакована количина мора бити јед
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr "Ред {0}: Документ листе паковања је већ креиран за ставку {1}."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr "Ред {0}: Странка / Рачун се не подудара са {1} / {2} у {3} {4}"
@@ -46176,11 +46266,11 @@ msgstr "Ред {0}: Врста странке и странка су обаве
msgid "Row {0}: Payment Term is mandatory"
msgstr "Ред {0}: Услов плаћања је обавезан"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr "Ред {0}: Плаћање на основу продајне/набавне поруџбине увек треба означити као аванс"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr "Ред {0}: Молимо Вас да означите опцију 'Аванс' за рачун {1} уколико је ово авансни унос."
@@ -46248,7 +46338,7 @@ msgstr "Ред {0}: Промену није могуће спровести је
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr "Ред {0}: Подуговорена ставка је обавезна за сировину {1}"
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr "Ред {0}: Циљано складиште је обавезно за интерне трансфере"
@@ -46272,7 +46362,7 @@ msgstr "Ред {0}: За постављање периодичности {1}, р
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "Ред {0}: Фактор конверзије јединица мере је обавезан"
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: 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}"
@@ -46293,7 +46383,7 @@ msgstr "Ред {0}: {1} мора бити веће од 0"
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr "Ред {0}: {1} {2} не може бити исто као {3} (Рачун странке) {4}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr "Ред {0}: {1} {2} се не подудара са {3}"
@@ -46686,7 +46776,7 @@ msgstr "Излазна фактура није креирана од стран
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr "Режим излазног фактурисања је активиран у малопродаји. Молимо Вас да направите излазну фактуру уместо тога."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr "Излазна фактура {0} је већ поднета"
@@ -46915,7 +47005,7 @@ msgstr "Статус продајне поруџбине"
msgid "Sales Order Trends"
msgstr "Трендови продајне поруџбине"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr "Продајна поруџбина је потребна за ставку {0}"
@@ -47425,8 +47515,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47699,7 +47789,7 @@ msgstr "Цена материјала отписа (валута компани
msgid "Scrap Warehouse"
msgstr "Складиште за отпис"
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr "Датум отписа не може бити пре датума набавке"
@@ -47772,7 +47862,7 @@ msgstr "Секретар"
msgid "Section"
msgstr "Одељак"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr "Шифра одељка"
@@ -48143,7 +48233,7 @@ msgstr "Изаберите, како би купац могао да буде п
msgid "Selected POS Opening Entry should be open."
msgstr "Изабрани унос почетног стања за малопродају треба да буде отворен."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr "Изабрани ценовник треба да има означена поља за набавку и продају."
@@ -48327,7 +48417,7 @@ msgstr "Пошаљи са прилогом"
msgid "Sender"
msgstr "Пошиљалац"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr "Слање"
@@ -48451,7 +48541,9 @@ msgstr "Бројеви серије / шарже"
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48482,7 +48574,9 @@ msgid "Serial No Count"
msgstr "Број серијских бројева"
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr "Дневник бројева серија"
@@ -48490,7 +48584,7 @@ msgstr "Дневник бројева серија"
msgid "Serial No Range"
msgstr "Опсег серијских бројева"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr "Резервисани број серије"
@@ -48530,6 +48624,13 @@ msgstr "Број серије и шаржа"
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr "Селектор броја серије и шарже не може бити коришћен када је опција користи поља за серију / шаржу омогућена."
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr "Пратљивост броја серије и шарже"
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr "Број серије је обавезан"
@@ -48559,7 +48660,7 @@ msgstr "Број серије {0} не припада ставци {1}"
msgid "Serial No {0} does not exist"
msgstr "Број серије {0} не постоји"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr "Број серије {0} не постоји"
@@ -48608,7 +48709,7 @@ msgstr "Бројеви серије / Бројеви шарже"
msgid "Serial Nos and Batches"
msgstr "Бројеви серије и шарже"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr "Бројеви серије су успешно креирани"
@@ -48686,11 +48787,11 @@ msgstr "Серија и шаржа"
msgid "Serial and Batch Bundle"
msgstr "Пакет серије и шарже"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr "Пакет серије и шарже је креиран"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr "Пакет серије и шарже је ажуриран"
@@ -49124,7 +49225,7 @@ msgstr "Постави укупне трошкове на основу цене
msgid "Set Loyalty Program"
msgstr "Постави програм лојалности"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr "Постави нови датум издавања"
@@ -49379,7 +49480,7 @@ msgstr "Постављање рачуна као рачун компаније
msgid "Setting up company"
msgstr "Постављање компаније"
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr "Подешавање {0} је неопходно"
@@ -49563,7 +49664,7 @@ msgstr "Врста пошиљке"
msgid "Shipment details"
msgstr "Детаљи испоруке"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr "Испоруке"
@@ -49810,6 +49911,10 @@ msgstr "Прикажи отказане уносе"
msgid "Show Completed"
msgstr "Прикажи завршено"
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr "Прикажи потражује / дугује у валути компаније"
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr "Прикажи кумулативни износ"
@@ -49925,7 +50030,7 @@ msgstr "Прикажи преглед"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr "Прикажи напомене"
@@ -50232,13 +50337,27 @@ msgstr "Извор"
msgid "Source DocType"
msgstr "Изворни DocType"
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr "Изворни документ"
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr "Назив изворног документа"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr "Број изворног документа"
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr "Врста изворног документа"
@@ -50309,7 +50428,7 @@ msgstr "Адреса изворног складишта"
msgid "Source Warehouse Address Link"
msgstr "Линк за адресу изворног складишта"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr "Изворно складиште је обавезно за ставку {0}."
@@ -50820,7 +50939,7 @@ msgstr "Својства стања"
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51163,7 +51282,7 @@ msgstr "Унос залиха {0} креиран"
msgid "Stock Entry {0} has created"
msgstr "Унос залиха {0} је креиран"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr "Унос залиха {0} није поднет"
@@ -51386,13 +51505,13 @@ msgstr "Подешавање поновне обраде залиха"
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51401,13 +51520,13 @@ msgstr "Подешавање поновне обраде залиха"
msgid "Stock Reservation"
msgstr "Резервација залиха"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr "Уноси резервације залиха отказани"
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr "Уноси резервације залиха креирани"
@@ -51429,7 +51548,7 @@ msgstr "Унос резервације залиха не може бити аж
msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr "Унос резервације залиха креиран против листе за одабир не може бити ажуриран. Уколико је потребно да направите промене, препоручујемо да откажете постојећи унос и креирате нови."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr "Неподударање складишта за резервацију залиха"
@@ -51674,7 +51793,7 @@ msgstr "Залихе и производња"
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr "Залихе не могу бити резервисане у групном складишту {0}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr "Залихе не могу бити резервисане у групном складишту {0}."
@@ -51690,7 +51809,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr "Поништено је резервисање залиха за радни налог {0}."
@@ -52558,10 +52677,15 @@ 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "Добављач"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr "Добављач > Врста добављача"
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52674,7 +52798,7 @@ msgstr "Фактура добављача"
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr "Датум издавања фактуре добављача"
@@ -52688,8 +52812,8 @@ 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "Број фактуре добављача"
@@ -53236,16 +53360,16 @@ msgstr "Систем неће проверавати наплату јер је
msgid "System will notify to increase or decrease quantity or amount "
msgstr "Систем ће извршити обавештавање у случају повећања или смањења количине или износа "
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr "Износ пореза прикупљеног на извору"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr "Стопа пореза прикупљеног на извору %"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr "Износ пореза одбијеног на извору"
@@ -53262,7 +53386,7 @@ msgstr "Одбијен порез по одбитку на извору"
msgid "TDS Payable"
msgstr "Обавеза за порез који је одбијен на извору"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr "Стопа пореза који је одбијен на извору %"
@@ -53818,7 +53942,7 @@ msgstr "Врста пореза"
msgid "Tax Withheld Vouchers"
msgstr "Порески документ са порезом по одбитку"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr "Порез по одбитку"
@@ -54444,7 +54568,7 @@ msgstr "Приступ захтеву за понуду са портала је
msgid "The BOM which will be replaced"
msgstr "Саставница која ће бити замењена"
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr "Шаржа {0} садржи негативну количину {1} у складишту {2}. Молимо Вас да исправите количину."
@@ -54472,7 +54596,7 @@ msgstr "Уноси у главну књигу ће бити отказани у
msgid "The Loyalty Program isn't valid for the selected company"
msgstr "Програм лојалности није важећи за изабрану компанију"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr "Захтев за наплату {0} је већ плаћен, плаћање се не може обрадити два пута"
@@ -54496,7 +54620,7 @@ msgstr "Продавац је повезан са {0}"
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr "Број серије у реду #{0}: {1} није доступан у складишту {2}."
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr "Серијски број {0} је резервисан за {1} {2} и не може се користити за било коју другу трансакцију."
@@ -54518,7 +54642,7 @@ msgstr "Радни налог је обавезан за налог за дем
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr "Аналитички рачун који је обавеза или капитал, на ком ће добитак или губитак бити књижен"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr "Распоређени износ је већи од неизмиреног износа у захтеву за наплату {0}"
@@ -54559,7 +54683,7 @@ msgstr "Поље од власника не може бити празно"
msgid "The field To Shareholder cannot be blank"
msgstr "Поље ка власнику не може бити празно"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr "Поље {0} у реду {1} није постављено"
@@ -54575,7 +54699,7 @@ msgstr "Референтни бројеви се не поклапају"
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr "Следеће ставке, које имају правила складиштења, нису могле бити распоређене:"
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr "Следећа имовина није могла аутоматски да постави уносе за амортизацију: {0}"
@@ -54836,6 +54960,10 @@ msgstr "{0} {1} се не подудара са {0} {2} у {3} {4}"
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr "{0} {1} се корсити за израчунавање вредности трошкова за готов производ {2}."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr "Постоје активна одржавања или поправке за ову имовину. Морате их завршити пре него што откажете имовину."
@@ -55102,7 +55230,7 @@ msgstr "Овај распоред је креиран када је имовин
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr "Овај распоред је креиран када је имовина {0} враћена након поништавања капитализације имовине {1}."
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr "Овај распоред је креиран када је имовина {0} враћена."
@@ -55110,7 +55238,7 @@ msgstr "Овај распоред је креиран када је имовин
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr "Овај распоред је креиран када је имовина {0} враћена путем излазне фактуре {1}."
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr "Овај распоред је креиран када је имовина {0} отписана."
@@ -55885,6 +56013,10 @@ msgstr "Да би порез био укључен у ред {0} у цени с
msgid "To merge, following properties must be same for both items"
msgstr "За спајање, следеће особине морају бити исте за обе ставке"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr "Да се ценовно правило не примени у одређеној трансакцији, сва примењива ценовна правила треба онемогућити."
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr "Да бисте ово поништили, омогућите '{0}' у компанији {1}"
@@ -55902,7 +56034,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr "Да бисте поднели фактуру без пријемница набавке, молимо Вас да поставите {0} као {1} у {2}"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr "Да бисте користили другу финансијску евиденцију, поништите означавање опције 'Укључи подразумевану имовину у финансијским евиденцијама'"
@@ -56124,7 +56256,7 @@ msgstr "Укупне расподеле"
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56286,7 +56418,7 @@ msgstr "Укупан износ потражује/дугује треба да
msgid "Total Debit"
msgstr "Укупно дугује"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr "Укупан износ дугује мора да буде једнак укупном изнсоу потражује. Разлика је {0}"
@@ -56879,6 +57011,10 @@ msgstr "Укупно"
msgid "Traceability"
msgstr "Пратљивост"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr "Правац пратљивости"
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56919,7 +57055,7 @@ msgstr "URL за праћење"
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -57017,7 +57153,7 @@ msgstr "Подешавање трансакције"
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr "Врста трансакције"
@@ -57039,7 +57175,7 @@ msgstr "Референца трансакције број {0} од {1}"
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57636,7 +57772,11 @@ msgstr "Нераспоређени износ"
msgid "Unassigned Qty"
msgstr "Недодељена количина"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr "Нефактурисане поруџбине"
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr "Одблокирај фактуру"
@@ -59003,7 +59143,7 @@ msgstr "Фактура добављача"
msgid "Vendor Invoices"
msgstr "Фактуре добављача"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr "Назив добављача"
@@ -59070,7 +59210,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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59261,11 +59401,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59300,7 +59440,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr "Подврста документа"
@@ -59332,9 +59472,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59353,6 +59493,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_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
@@ -59562,6 +59703,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_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
@@ -59670,7 +59812,7 @@ msgstr "Складиште и референца"
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr "Складиште не може бити обрисано јер постоје уноси у књигу залиха за ово складиште."
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr "Складиште не може бити промењено за број серије."
@@ -59683,7 +59825,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:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr "Складиште је обавезно за ставку залиха {0}"
@@ -59834,7 +59976,7 @@ msgstr "Упозорење на негативно стање залиха"
msgid "Warning!"
msgstr "Упозорење!"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr "Упозорење: Још један {0} # {1} постоји у односу на унос залиха {2}"
@@ -60317,6 +60459,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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "Радни налог"
@@ -60792,7 +60935,7 @@ msgstr "Увозите податке за листу шифара:"
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr "Нисте овлашћени да ажурирате према условима постављеним у радном току {}."
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr "Нисте овлашћени да додајете или ажурирате уносе пре {0}"
@@ -60824,7 +60967,7 @@ msgstr "Такође можете поставити подразумевани
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr "Можете променити матични рачун у рачун биланса стања или изабрати други рачун."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr "Не можете унети тренутни документ у колону 'Против налог књижења'"
@@ -60841,7 +60984,7 @@ msgstr "Можете искористити максимално {0} поена
msgid "You can only select one mode of payment as default"
msgstr "Можете изабрати само један начин плаћања као подразумевани"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr "Можете искористити до {0}."
@@ -60873,11 +61016,11 @@ msgstr "Не можете креирати {0} унутар затвореног
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr "Не можете креирати или отказати никакве рачуноводствене уносе у затвореном рачуноводственом периоду {0}"
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr "Не можете креирати/изменити рачуноводствене уносе до овог датума."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr "Не можете истовремено књижити дуговну и потражну страну на истом рачуну"
@@ -60893,7 +61036,7 @@ msgstr "Не можете уређивати коренски чвор."
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr "Не можете омогућити оба подешавања '{0}' и '{1}'."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr "Не можете искористити више од {0}."
@@ -60925,7 +61068,7 @@ msgstr "Немате дозволу да {} ставке у {}."
msgid "You don't have enough Loyalty Points to redeem"
msgstr "Немате довољно поена лојалности да бисте их искористили"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr "Немате довољно поена да бисте их искористили."
@@ -61351,7 +61494,7 @@ msgstr "наслов"
msgid "to"
msgstr "ка"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr "да бисте расподелили износ ове рекламационе фактуре пе њеног отказивања."
@@ -61391,7 +61534,7 @@ msgstr "{0}"
msgid "{0} '{1}' is disabled"
msgstr "{0} '{1}' је онемогућен"
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr "{0} '{1}' није у фискалној години {2}"
@@ -61423,7 +61566,7 @@ msgstr "{0} купона искоришћено за {1}. Дозвољена к
msgid "{0} Digest"
msgstr "{0} Извештај"
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr "{0} број {1} већ коришћен у {2} {3}"
@@ -61439,7 +61582,7 @@ msgstr "{0} захтев за {1}"
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr "{0} задржавање узорка се заснива на шаржи, молимо Вас да проверите да ли ставка има број шарже како бисте задржали узорак"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr "{0} трансакција(е) усклађено"
@@ -61455,19 +61598,19 @@ msgstr "{0} рачун није врста {1}"
msgid "{0} account not found while submitting purchase receipt"
msgstr "{0} налог није пронађен приликом подношења пријемнице набавке"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr "{0} према рачуну {1} на датум {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr "{0} против набавне поруџбине {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr "{0} против излазне фактуре {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr "{0} према продајној поруџбини {1}"
@@ -61475,7 +61618,7 @@ msgstr "{0} према продајној поруџбини {1}"
msgid "{0} already has a Parent Procedure {1}."
msgstr "{0} већ има матичну процедуру {1}."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr "{0} и {1}"
@@ -61534,7 +61677,7 @@ msgstr "{0} унет два пута у ставке пореза"
msgid "{0} entered twice {1} in Item Taxes"
msgstr "{0} унет два пута {1} у ставке пореза"
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr "{0} за {1}"
@@ -61587,7 +61730,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr "{0} је обавезно за ставку {1}"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr "{0} је обавезно за рачун {1}"
@@ -61662,7 +61805,7 @@ msgstr "{0} ставки произведено"
msgid "{0} must be negative in return document"
msgstr "{0} мора бити негативан у повратном документу"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr "{0} није дозвољена трансакција са {1}. Молимо Вас да промените компанију или да додате компанију у одељак 'Дозвољене трансакције са' у запису купца."
@@ -61678,7 +61821,7 @@ msgstr "Параметар {0} је неважећи"
msgid "{0} payment entries can not be filtered by {1}"
msgstr "Уноси плаћања {0} не могу се филтрирати према {1}"
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr "Количина {0} за ставку {1} се прима у складиште {2} са капацитетом {3}."
@@ -61739,7 +61882,7 @@ msgstr "{0} {1}"
msgid "{0} {1} Manually"
msgstr "{0} {1} ручно"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr "{0} {1} делимично усклађено"
@@ -61804,7 +61947,7 @@ msgstr "{0} {1} је отказано или заустављено"
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr "{0} {1} је отказано, самим тим радња се не може завршити"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr "{0} {1} је затворео"
@@ -61816,7 +61959,7 @@ msgstr "{0} {1} је онемогућено"
msgid "{0} {1} is frozen"
msgstr "{0} {1} је закључано"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr "{0} {1} је у потпуности фактурисано"
@@ -61828,12 +61971,12 @@ msgstr "{0} {1} није активно"
msgid "{0} {1} is not associated with {2} {3}"
msgstr "{0} {1} није повезано са {2} {3}"
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr "{0} {1} није ни у једној активној фискалној години"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr "{0} {1} није поднето"
@@ -61845,7 +61988,7 @@ msgstr "{0} {1} је на чекању"
msgid "{0} {1} must be submitted"
msgstr "{0} {1} мора бити поднето"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr "{0} {1} није дозвољена поновна обрада. Измените {2} да бисте омогућили поновну обраду."
@@ -61880,7 +62023,7 @@ msgstr "{0} {1}: рачун {2} је неактиван"
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr "{0} {1}: рачуноводствени унос {2} може бити направљен само у валути: {3}"
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr "{0} {1}: трошковни центар је обавезан за ставку {2}"
@@ -61958,7 +62101,7 @@ msgstr "{doctype} {name} је отказано или затворено."
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr "{field_label} је обавезно за подуговорени посао {doctype}."
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr "Величина узорка за {item_name} ({sample_size}) не може бити већа од прихваћене количине ({accepted_quantity})"
@@ -61966,7 +62109,7 @@ msgstr "Величина узорка за {item_name} ({sample_size}) не мо
msgid "{ref_doctype} {ref_name} is {status}."
msgstr "{ref_doctype} {ref_name} је {status}."
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr "{}"
@@ -62024,7 +62167,7 @@ msgstr "{} на чекању"
msgid "{} To Bill"
msgstr "{} за фактурисање"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr "{} не може бити отказано јер су зарађени поени лојалности искоришћени. Прво откажите {} број {}"
diff --git a/erpnext/locale/sr_CS.po b/erpnext/locale/sr_CS.po
index 732b86f58c2..f0024ae8cbb 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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-09 16:53\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:06\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Serbian (Latin)\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr " Stavka"
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr "'Dani od poslednje narudžbine' moraju biti veći ili jednaki nuli"
msgid "'Default {0} Account' in Company {1}"
msgstr "'Podrazumevani {0} račun' u kompaniji {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr "'Unosi' ne mogu biti prazni"
@@ -919,11 +919,11 @@ msgstr "Vaše prečice\n"
msgid "Your Shortcuts"
msgstr "Vaše prečice"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr "Ukupan iznos: {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr "Neizmireni iznos: {0}"
@@ -1319,10 +1319,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1627,7 +1627,7 @@ msgstr "Račun {0}: Matični račun {1} ne postoji"
msgid "Account {0}: You can not assign itself as parent account"
msgstr "Račun {0}: Ne može se samopostaviti kao matični račun"
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr "Račun: {0} je nedovršeni kapital u radu i ne može se ažurirati kroz nalog knjiženja"
@@ -2116,7 +2116,7 @@ msgstr "Računi su zaključani do datuma"
msgid "Accounts Manager"
msgstr "Account Manager"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr "Greška zbog nedostajućeg računa"
@@ -2303,7 +2303,7 @@ msgstr "Podešavanje računa"
msgid "Accounts User"
msgstr "Knjigovođa"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr "Tabela računa ne može biti prazna."
@@ -2663,6 +2663,10 @@ msgstr "Stvarno vreme završetka"
msgid "Actual Expense"
msgstr "Stvarni trošak"
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr "Stvarni troškovi"
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2800,7 +2804,7 @@ msgstr "Dodaj / Izmeni cene"
msgid "Add Child"
msgstr "Dodaj zavisni element"
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr "Dodaj kolone u valuti transakcije"
@@ -3606,7 +3610,7 @@ msgstr "Iznos avansa"
msgid "Advance amount cannot be greater than {0} {1}"
msgstr "Iznos avansa ne može biti veći od {0} {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr "Iznos plaćenog avansa {0} {1} ne može biti veći od {2}"
@@ -3663,7 +3667,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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr "Protiv računa"
@@ -3732,7 +3736,7 @@ msgstr "Protiv računa rashoda"
msgid "Against Income Account"
msgstr "Protiv računa prihoda"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr "Protiv nalog knjiženja {0} ne postoji nijedan neusklađeni unos {1}"
@@ -3780,7 +3784,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr "Protiv dokumenta"
@@ -3792,7 +3796,7 @@ msgstr "Protiv dokumenta"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr "Protiv broja dokumenta"
@@ -3804,8 +3808,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr "Protiv vrste dokumenta"
@@ -3931,7 +3935,7 @@ msgstr "Sve"
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr "Svi nalozi"
@@ -4099,7 +4103,7 @@ msgstr "Sve stavke su već zahtevane"
msgid "All items have already been Invoiced/Returned"
msgstr "Sve stavke su već fakturisane/vraćene"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr "Sve stavke su već primljene"
@@ -4125,7 +4129,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:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr "Sve ove stavke su već fakturisane/vraćene"
@@ -5011,7 +5015,7 @@ msgstr "Izmenjeno iz"
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5151,7 +5155,7 @@ msgstr "Iznos u ciframa"
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr "Iznos u valuti računa"
@@ -5302,7 +5306,7 @@ msgstr "Već postoji drugi budžetski zapis '{0}' u vezi sa {1} '{2}' and račun
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr "Već postoji drugi zapis o raspodeli troškovnog centra {0} koji važi od {1}, stoga će ova raspodela važiti do {2}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr "Drugi zahtev za naplatu se već obrađuje"
@@ -5448,11 +5452,11 @@ msgstr "Primenjena šifra kupona"
#. Inspection Reading'
#: erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
msgid "Applied on each reading."
-msgstr "Primeni na svako očitavanje."
+msgstr "Primenjeno na svako očitavanje."
#: erpnext/stock/doctype/putaway_rule/putaway_rule.py:183
msgid "Applied putaway rules."
-msgstr "Primeni pravila skladištenja."
+msgstr "Primenjena pravila skladištenja."
#. Label of the applies_to (Table) field in DocType 'Common Code'
#: erpnext/edi/doctype/common_code/common_code.json
@@ -5885,7 +5889,7 @@ msgstr "Stavka zaliha za kapitalizaciju imovine"
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5927,7 +5931,7 @@ msgstr "Raspored amortizacije imovine"
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr "Raspored amortizacije za imovinu {0} i finansijsku evidenciju {1} ne koristi amortizaciju zasnovanu na smenama"
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr "Raspored amortizacije nije pronađen za imovinu {0} i finansijsku evidenciju {1}"
@@ -5966,7 +5970,7 @@ msgstr "Otuđenje imovine"
msgid "Asset Finance Book"
msgstr "Finansijska evidencija imovine"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr "ID imovine"
@@ -6042,7 +6046,7 @@ msgstr "Evidencija kretanja imovine {0} je kreirana"
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr "Naziv imovine"
@@ -6128,9 +6132,9 @@ msgstr "Status imovine"
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr "Vrednost imovine"
@@ -6159,7 +6163,7 @@ msgstr "Imovina otkazana"
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "Imovina ne može biti otkazana, jer je već {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr "Imovina ne može biti otpisana pre poslednjeg unosa amortizacije."
@@ -6191,7 +6195,7 @@ msgstr "Imovina je van funkcije zbog popravke imovine {0}"
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr "Imovina primljena na lokaciji {0} i data zaposlenom licu {1}"
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr "Imovina vraćena u prethodno stanje"
@@ -6203,11 +6207,11 @@ msgstr "Imovina je vraćena u prethodno stanje nakon što je kapitalizacija imov
msgid "Asset returned"
msgstr "Imovina vraćena"
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr "Otpisana imovina"
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr "Imovina je otpisana putem naloga knjiženja {0}"
@@ -6232,7 +6236,7 @@ msgstr "Imovina ažurirana nakon što je podeljeno na imovinu {0}"
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr "Imovina je ažurirana zbog popravke imovine {0} {1}."
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr "Imovina {0} ne može biti otpisana, jer je već {1}"
@@ -6265,7 +6269,15 @@ msgstr "Imovina {0} je ažurirana. Molimo Vas da postavite detalje o amortizacij
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr "Imovina {0} je u statusu {1} i ne može biti popravljena."
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr "Imovina {0} nije podešena za obračun amortizacije."
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr "Imovina {0} nije podneta. Molimo Vas da podnesete imovinu pre nastavka."
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr "Imovina {0} mora biti podneta"
@@ -6646,7 +6658,7 @@ msgstr "Automatsko usklađivanje"
msgid "Auto Reconcile Payments"
msgstr "Automatsko usklađivanje uplata"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr "Automatsko usklađivanje"
@@ -6656,7 +6668,7 @@ msgstr "Automatsko usklađivanje"
msgid "Auto Reconciliation Job Trigger"
msgstr "Automatsko usklađivanje zadataka"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr "Automatsko usklađivanje je započeto u pozadini"
@@ -6831,7 +6843,7 @@ msgstr "Dostupna količina šarže u skladištu"
msgid "Available Batch Report"
msgstr "Izveštaj o dostupnim stavkama šarže"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr "Datum dostupnosti za upotrebu"
@@ -7060,7 +7072,7 @@ msgstr "Sastavnica"
msgid "BOM 1"
msgstr "Sastavnica 1"
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
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"
@@ -7298,23 +7310,23 @@ msgstr "Sastavnica ne sadrži nijednu stavku zaliha"
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr "Rekurzija sastavnice: {0} ne može proisteći iz {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
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:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr "Sastavnica {0} ne pripada stavci {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr "Sastavnica {0} mora biti aktivna"
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr "Sastavnica {0} mora biti podneta"
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr "Sastavnica {0} nije pronađena za stavku {1}"
@@ -7385,7 +7397,7 @@ msgstr "Stanje"
msgid "Balance (Dr - Cr)"
msgstr "Stanje (D - P)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr "Stanje ({0})"
@@ -7864,7 +7876,7 @@ msgstr "Osnovna cena"
msgid "Base Tax Withholding Net Total"
msgstr "Osnovni iznos poreza po odbitku (neto ukupno)"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr "Ukupno osnova"
@@ -8069,7 +8081,9 @@ msgstr "Status isteka stavke šarže"
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -8080,7 +8094,7 @@ msgstr "Broj šarže"
msgid "Batch No is mandatory"
msgstr "Broj šarže je obavezan"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr "Broj šarže {0} ne postoji"
@@ -8103,7 +8117,7 @@ msgstr "Broj šarže."
msgid "Batch Nos"
msgstr "Brojevi šarže"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr "Brojevi šarže su uspešno kreirani"
@@ -8116,7 +8130,7 @@ msgstr "Šarža nije dostupna za povrat"
msgid "Batch Number Series"
msgstr "Brojčana serija šarže"
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr "Količina šarže"
@@ -8229,7 +8243,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8542,8 +8556,8 @@ msgstr "Stavka okvirne narudžbine"
msgid "Blanket Order Rate"
msgstr "Cena okvirne narudžine"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr "Blokirati fakturu"
@@ -8659,7 +8673,7 @@ msgstr "Upisano osnovno sredstvo"
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr "Knjigovodstvena vrednost zaliha preko više računa otežaće praćenje zaliha i vrednosti po računu."
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr "Knjige su zatvorene do perioda koji se završava {0}"
@@ -9433,7 +9447,7 @@ msgstr "Ne može se filtrirati prema metodi plaćanja, ako je grupisano po metod
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr "Ne može se filtrirati prema broju dokumenta, ukoliko je grupisano po dokumentu"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr "Može se izvršiti plaćanje samo za neizmirene {0}"
@@ -9619,7 +9633,7 @@ msgstr "Ne može se optimizovati ruta jer nedostaje adresa vozača."
msgid "Cannot Relieve Employee"
msgstr "Ne može se otpustiti zaposleno lice"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr "Nije moguće ponovo podneti unos za dokumente koji pripadaju fiskalnoj godini koja je zatvorena."
@@ -9635,6 +9649,10 @@ msgstr "Ne može se primeniti porez odbijen na izvoru protiv više stranaka u je
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr "Ne može biti osnovno sredstvo jer je kreirana knjiga zaliha."
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr "Nije moguće otkazati raspored amortizacije imovine {0} jer postoji nacrt naloga knjiženja {1}."
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr "Nije moguće otkazati unos zatvaranja maloprodaje"
@@ -9724,7 +9742,7 @@ msgstr "Nije moguće kreirati povrat za konsolidovanu fakturu {0}."
msgid "Cannot create root account."
msgstr "Nije moguće kreirati osnovni račun."
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
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"
@@ -9741,7 +9759,7 @@ msgstr "Ne može se odbiti kada je kategorija za 'Vrednovanje' ili 'Vrednovanje
msgid "Cannot delete Exchange Gain/Loss row"
msgstr "Ne može se obrisati red prihoda/rashoda kursnih razlika"
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr "Ne može se obrisati broj serije {0}, jer se koristi u transakcijama sa zalihama"
@@ -10187,11 +10205,11 @@ msgstr "Lanac"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr "Promena inznosa"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr "Promena datuma objaljivanja"
@@ -10204,7 +10222,7 @@ msgstr "Promena datuma objaljivanja"
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr "Promena vrednosti zaliha"
@@ -11012,6 +11030,7 @@ msgstr "Kompanije"
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11159,6 +11178,7 @@ msgstr "Kompanije"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11244,8 +11264,8 @@ msgstr "Kompanije"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11561,7 +11581,7 @@ msgstr "PIB kompanije"
msgid "Company and Posting Date is mandatory"
msgstr "Kompanija i datum knjiženja su obavezni"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr "Valute oba preduzeća moraju biti iste za međukompanijske transakcije."
@@ -12842,7 +12862,7 @@ 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12861,7 +12881,7 @@ msgstr "Trošak"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -13074,7 +13094,7 @@ msgstr "Nije moguće obrisati demo podatke"
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:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
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"
@@ -13197,15 +13217,15 @@ msgstr "Potražuje"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13447,7 +13467,7 @@ msgstr "Kreiraj priliku"
msgid "Create POS Opening Entry"
msgstr "Kreiraj unos početnog stanja maloprodaje"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr "Kreiraj unos uplate"
@@ -13603,7 +13623,7 @@ msgstr "Kreiranje računa..."
msgid "Creating Delivery Note ..."
msgstr "Kreiranje otpremnice..."
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr "Kreiranje dimenzija..."
@@ -13623,7 +13643,7 @@ msgstr "Kreiranje ulaznih faktura …"
msgid "Creating Purchase Order ..."
msgstr "Kreiranje nabavne porudžbine ..."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13660,11 +13680,6 @@ msgstr "Kreiranje {} od {} {}"
msgid "Creation"
msgstr "Kreiranje"
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr "Broj dokumenta kreiranja"
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr "Kreiranje {1}(s) uspešno"
@@ -13699,11 +13714,11 @@ msgstr "Kreiranje {0} delimično uspešno.\n"
msgid "Credit"
msgstr "Potražuje"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr "Potražuje (Transakcija)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr "Potražuje ({0})"
@@ -13846,7 +13861,7 @@ 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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr "Dokument o smanjenju {0} je automatski kreiran"
@@ -13930,7 +13945,7 @@ msgstr "Interval Cron zadatka treba da bude između 1 i 59 minuta"
#. Description of a DocType
#: erpnext/setup/doctype/website_item_group/website_item_group.json
msgid "Cross Listing of Item in multiple groups"
-msgstr "Prekršeno listanje stavki u više grupa"
+msgstr "Unakrsno navođenje stavki u više grupa"
#. Name of a UOM
#: erpnext/setup/setup_wizard/data/uom_data.json
@@ -14054,7 +14069,7 @@ msgstr "Šolja"
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14153,7 +14168,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:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr "Valuta za {0} mora biti {1}"
@@ -14503,6 +14518,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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14530,6 +14546,10 @@ msgstr "Kupac / Stavka / Grupa stavki"
msgid "Customer / Lead Address"
msgstr "Adresa kupca / potencijalnog kupca"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr "Kupac > Grupa kupaca > Teritorija"
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14931,7 +14951,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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr "Kupac {0} ne pripada projektu {1}"
@@ -15283,7 +15303,7 @@ msgstr "Datum izdavanja"
msgid "Date of Joining"
msgstr "Datum pridruživanja"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr "Datum transakcije"
@@ -15420,11 +15440,11 @@ msgstr "Poštovani menadžeru sistema,"
msgid "Debit"
msgstr "Duguje"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr "Duguje (Transakcija)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr "Duguje ({0})"
@@ -15498,7 +15518,7 @@ msgstr "Duguje prema"
msgid "Debit To is required"
msgstr "Duguje prema je obavezno"
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr "Duguje i potražuje nisu u ravnoteži za {0} #{1}. Razlika je {2}."
@@ -16565,7 +16585,7 @@ msgstr "Demo podaci obrisani"
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16640,9 +16660,9 @@ msgstr "Amortizovati na osnovu dnevne proporcije"
msgid "Depreciate based on shifts"
msgstr "Amortizovani na osnovu smene"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr "Amortizovana suma"
@@ -16698,6 +16718,14 @@ msgstr "Unos amortizacije"
msgid "Depreciation Entry Posting Status"
msgstr "Status knjiženja unosa amortizacije"
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr "Unos amortizacije za imovinu {0}"
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr "Unos amortizacije za {0} u vrednosti od {1}"
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16706,7 +16734,7 @@ msgstr "Status knjiženja unosa amortizacije"
msgid "Depreciation Expense Account"
msgstr "Račun za trošak amortizacije"
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr "Račun za trošak amortizacije mora biti račun prihoda ili rashoda."
@@ -17592,6 +17620,10 @@ msgstr "Datum popusta"
msgid "Discount Percentage"
msgstr "Procenat popusta"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr "Procenat popusta može se primeniti ili na jedan cenovnik ili na sve cenovnike."
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr "Procenat popusta u transakciji"
@@ -17824,7 +17856,7 @@ msgstr "Postavke otpreme"
msgid "Disposal Date"
msgstr "Datum otuđenja"
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr "Datum otuđenja {0} ne može biti pre {1} datuma {2} za imovinu."
@@ -18104,7 +18136,7 @@ msgstr "Dokumenti"
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr "Dokumenti obrađeni pri svakom okidaču. Veličina reda treba da bude između 5 i 100"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr "Dokumenti: {0} imaju omogućene razgraničene prihode/troškove. Ne mogu se ponovo knjižiti."
@@ -19143,7 +19175,7 @@ msgstr "Prazno"
msgid "Ems(Pica)"
msgstr "Ems (Pica)"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
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."
@@ -19494,7 +19526,7 @@ msgstr "Unesite naziv za operaciju, na primer, Sečenje."
msgid "Enter a name for this Holiday List."
msgstr "Unesite naziv za ovu listu praznika."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr "Unesite iznos koji želite da iskoristite."
@@ -19556,7 +19588,7 @@ msgstr "Unesite količinu stavki koja će biti proizvedena iz ove sastavnice."
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr "Unesite količinu za proizvodnju. Stavke sirovine će biti preuzete samo ukoliko je ovo postavljeno."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr "Unesite iznos za {0}."
@@ -19576,7 +19608,7 @@ msgid "Entity"
msgstr "Entitet"
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19671,7 +19703,7 @@ msgstr "Greška prilikom evaluacije formule kriterijuma"
msgid "Error in party matching for Bank Transaction {0}"
msgstr "Greška u usklađivanju stranke za bankovnu transakciju {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr "Greška prilikom knjiženja amortizacije"
@@ -19723,11 +19755,9 @@ msgstr "Procena vremena i troškova"
msgid "Evaluation Period"
msgstr "Period evaluacije"
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
-msgstr "Čak i fakture kod kojih porez po odbitku nije označen će biti uzete u obzir prilikom provere prekoračenja kumulativnog praga"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
+msgstr "Čak i ukoliko postoje više cenovnih pravila sa najvišim prioritetom, primenjuju se sledeći interni prioriteti:"
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
@@ -20089,7 +20119,7 @@ msgstr "Očekivana vrednost nakon korisnog veka"
msgid "Expense"
msgstr "Trošak"
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr "Račun rashoda / razlike ({0}) mora biti račun vrste 'Dobitak ili gubitak'"
@@ -20134,7 +20164,7 @@ msgstr "Račun rashoda / razlike ({0}) mora biti račun vrste 'Dobitak ili gubit
msgid "Expense Account"
msgstr "Račun rashoda"
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr "Nedostaje račun rashoda"
@@ -20441,7 +20471,7 @@ msgstr "Datum neuspeha"
msgid "Failure Description"
msgstr "Opis neuspeha"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr "Neuspeh: {0}"
@@ -21117,6 +21147,10 @@ msgstr "Osnovno sredstvo mora biti stavka van zaliha."
msgid "Fixed Asset Register"
msgstr "Registar osnovnih sredstava"
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr "Osnovno sredstvo {0} se ne može koristiti u sastavnicama."
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21247,7 +21281,7 @@ msgstr "Za podrazumevanog dobavljača (opciono)"
msgid "For Item"
msgstr "Za stavku"
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr "Za stavku {0} količina ne može biti primljena u većoj količini od {1} u odnosu na {2} {3}"
@@ -22139,7 +22173,7 @@ msgstr "Referenca budućeg plaćanja"
msgid "Future Payments"
msgstr "Buduća plaćanja"
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr "Budući datum nije dozvoljen"
@@ -22155,7 +22189,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:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr "Unos u glavnu knjigu"
@@ -22421,8 +22455,8 @@ 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:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22781,7 +22815,7 @@ msgstr "Gram/Litar"
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22791,7 +22825,7 @@ msgstr "Gram/Litar"
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22912,8 +22946,8 @@ msgstr "Procenat bruto profita"
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr "Ukupan iznos nabavke"
@@ -23264,7 +23298,7 @@ msgstr "Hektopaskal"
msgid "Height (cm)"
msgstr "Visina (cm)"
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr "Zdravo,"
@@ -23303,7 +23337,7 @@ msgstr "Tekst pomoći"
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr "Pomaže Vam da raspodelite budžet/cilj po mesecima ako imate sezonalnost u poslovanju."
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr "Ovo su evidencije grešaka za prethodno neuspele unose amortizacije: {0}"
@@ -23399,7 +23433,7 @@ msgstr "Stavi na čekanje"
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr "Stavi fakturu na čekanje"
@@ -23493,6 +23527,10 @@ msgstr "Časovi"
msgid "Hours Spent"
msgstr "Utrošeni časovi"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr "Na koji način se primenjuje cenovno pravilo?"
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23833,6 +23871,10 @@ msgstr "Ukoliko je navedeno, sistem će omogućiti samo korisnicima sa ovom ulog
msgid "If more than one package of the same type (for print)"
msgstr "Ukoliko ima više od jednog pakovanja iste vrste (za štampu)"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr "Ukoliko više cenovnih pravila nastavljaju da važe, korisnik treba ručno da postavi prioritet radi rešavanja konflikta."
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23849,6 +23891,10 @@ msgstr "Ukoliko nije, možete otkazati/ podneti ovaj unos"
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr "Ukoliko je cena nula, stavke će se tretirati kao \"Besplatna stavka\""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr "Ukoliko je izabrano cenovno pravilo napravljeno za 'Jedinična cena' ono će zameniti cenovnik. Cena iz cenovnog pravila je konačna cena, u skladu sa tim ne bi trebalo primenjivati dodatno sniženje. Zbog toga će se u transakcijama poput prodajne porudžbine, nabavne porudžbine i slično, vrednosti uzimati iz polja 'Jedinična cena', a ne iz polja 'Osnovna cena u cenovniku'."
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23931,6 +23977,10 @@ msgstr "Ukoliko je označeno, više materijala može biti korišćeno za jedan r
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr "Ukoliko je označeno, cene iz sastavnica će se automatski ažurirati na osnovu stope vrednovanja / cenovnika / poslednje nabavke sirovina."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr "Ukoliko se na osnovu gore navedenih uslova pronađu dva ili više cenovnih pravila, primenjuje se prioritet. Prioritet je broj od 0 do 20, pri čemu je podrazumevana vrednost nula (prazno). Viši broj znači da će to pravilo imati prednost ukoliko postoje više cenovnih pravila sa istim uslovima."
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr "Ukoliko lojalti poeni nemaju ograničeni rok trajanja, ostavite polje roka trajanja kao prazno ili unesite 0."
@@ -24025,7 +24075,7 @@ msgstr "Ignoriši prazne zalihe"
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr "Ignoriši revalorizaciju deviznog kursa i dnevnike prihoda/rashoda"
@@ -24077,7 +24127,7 @@ msgstr "Pravilo o cenama je omogućeno. Nije moguće primeniti šifru kupona."
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr "Ignoriši dugovne/potražne beleške generisane od strane sistema"
@@ -24840,7 +24890,7 @@ msgstr "Postavke dolaznih poziva"
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24913,7 +24963,7 @@ msgstr "Netačni paketi serija i šarži"
msgid "Incorrect Stock Value Report"
msgstr "Izveštaj o netačnoj vrednosti zaliha"
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr "Netačan vrsta transakcije"
@@ -25080,13 +25130,13 @@ msgstr "Unesite nove zapise"
msgid "Inspected By"
msgstr "Inspekciju izvršio"
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr "Inspekcija odbijena"
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr "Inspekcija je potrebna"
@@ -25103,7 +25153,7 @@ msgstr "Inspekcija je potrebna pre isporuke"
msgid "Inspection Required before Purchase"
msgstr "Inspekcija je potrebna pre nabavke"
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr "Podnošenje inspekcije"
@@ -25133,7 +25183,7 @@ msgstr "Napomena o instalaciji"
msgid "Installation Note Item"
msgstr "Stavka u napomeni o instalaciji"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr "Napomena o instalaciji {0} je već podneta"
@@ -25191,7 +25241,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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "Nedovoljno zaliha"
@@ -25382,7 +25432,7 @@ msgstr "Interni transferi"
msgid "Internal Work History"
msgstr "Interna radna istorija"
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr "Interni transferi mogu se obaviti samo u osnovnoj valuti kompanije"
@@ -25418,7 +25468,7 @@ msgid "Invalid Account"
msgstr "Nevažeći račun"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr "Nevažeći raspoređeni iznos"
@@ -25446,7 +25496,7 @@ msgstr "Nevažeća okvirna narudžbina za izabranog kupca i stavku"
msgid "Invalid Child Procedure"
msgstr "Nevažeća zavisna procedura"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr "Nevažeća kompanija za međukompanijsku transakciju."
@@ -25504,7 +25554,7 @@ msgid "Invalid Ledger Entries"
msgstr "Nevažeći računovodstveni unosi"
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr "Nevažeći unos početnog stanja"
@@ -25532,7 +25582,7 @@ msgstr "Nevažeća primarna uloga"
msgid "Invalid Priority"
msgstr "Nevažeći prioritet"
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr "Nevažeća konfiguracija gubitaka u procesu"
@@ -25616,8 +25666,8 @@ msgstr "Nevažeći upit pretrage"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr "Nevažeća vrednost {0} za {1} u odnosu na račun {2}"
@@ -25625,7 +25675,7 @@ msgstr "Nevažeća vrednost {0} za {1} u odnosu na račun {2}"
msgid "Invalid {0}"
msgstr "Nevažeće {0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr "Nevažeće {0} za međukompanijsku transakciju."
@@ -25835,7 +25885,7 @@ msgstr "Fakturisana količina"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26887,6 +26937,8 @@ msgstr "Korpa stavke"
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26905,7 +26957,11 @@ msgstr "Šifra stavke"
msgid "Item Code (Final Product)"
msgstr "Šifra stavke (finalni proizvod)"
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr "Šifra stavke > Grupa stavki > Brend"
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr "Šifra stavke ne može biti promenjena za broj serije."
@@ -27309,6 +27365,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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28229,7 +28286,7 @@ msgstr "Nalog knjiženja za otpis"
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr "Vrsta naloga knjiženja treba da bude postavljena na unos amortizacije za amortizaciju imovine"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr "Nalog knjiženja {0} nema račun {1} ili je već usklađen sa drugim dokumentom"
@@ -28435,7 +28492,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:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29152,7 +29209,7 @@ msgstr "Lokalno"
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29823,7 +29880,7 @@ msgstr "Obavezna računovodstvena dimenzija"
msgid "Mandatory Depends On"
msgstr "Obavezno zavisi od"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr "Obavezno polje"
@@ -29913,6 +29970,7 @@ msgstr "Ručno unošenje ne može biti kreirano! Onemogućite automatski unos za
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30471,6 +30529,7 @@ msgid "Material Requested"
msgstr "Zatraženi materijal"
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr "Zahtevi za nabavku"
@@ -30826,7 +30885,7 @@ msgstr "Poruka"
msgid "Message Examples"
msgstr "Primeri poruka"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr "Poruka poslata"
@@ -31140,8 +31199,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr "Nedostajući račun"
@@ -31159,6 +31218,10 @@ 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
+msgid "Missing Filters"
+msgstr "Nedostaju filteri"
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr "Nedostajuća finansijska evidencija"
@@ -31191,7 +31254,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:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr "Nedostajuća vrednost"
@@ -31857,7 +31920,7 @@ msgstr "Prirodni gas"
msgid "Needs Analysis"
msgstr "Analiza potrebna"
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr "Negativna količina šarže"
@@ -32289,7 +32352,7 @@ msgstr "Nove prodajne porudžbine"
msgid "New Sales Person Name"
msgstr "Ime novog prodavca"
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr "Novi broj serije ne može imati skladište. Skladište mora biti postavljeno putem unosa zaliha ili kroz prijemnicu nabavke"
@@ -32325,7 +32388,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:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr "Novi datum objavljivanja mora biti u budućnosti"
@@ -32434,7 +32497,7 @@ msgstr "Bez radnje"
msgid "No Answer"
msgstr "Nema odgovora"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr "Nije pronađen kupac za međukompanijske transakcije koji predstavljaju kompaniju {0}"
@@ -32491,9 +32554,9 @@ msgstr "Nisu pronađene neizmirene fakture za ovu stranku"
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr "Ne postoji profil maloprodaje. Molimo Vas da kreirate novi profil maloprodaje"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr "Bez dozvole"
@@ -32528,7 +32591,7 @@ msgstr "Trenutno nema dostupnih zaliha"
msgid "No Summary"
msgstr "Nema rezimea"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr "Nema dobavljača za međukompanijske transakcije koji predstavlja kompaniju {0}"
@@ -32626,7 +32689,7 @@ msgstr "Nema stavki u korpi"
msgid "No items to be received are overdue"
msgstr "Nema stavki za prijem koje su zakasnile"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr "Nema poklapanja putem automatskog usklađivanja"
@@ -32760,11 +32823,11 @@ msgstr "Nije pronađena transakcija zaliha koje može biti kreirana ili izmenjen
msgid "No values"
msgstr "Bez vrednosti"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr "Ne postoji račun {0} za ovu kompaniju."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr "Nema {0} za međukompanijske transakcije."
@@ -32799,7 +32862,7 @@ msgstr "Kategorija nepodložna amortizaciji"
msgid "Non Profit"
msgstr "Neprofitno"
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr "Stavke van zaliha"
@@ -32978,7 +33041,7 @@ msgstr "Napomena: Datum dospeća premašuje dozvoljeno odloženo plaćanje od {0
msgid "Note: Email will not be sent to disabled users"
msgstr "Napomena: Imejl neće biti poslat onemogućenim korisnicima"
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr "Napomena: Ukoliko želite da koristite gotov proizvod {0} kao sirovinu, omogućite opciju 'Ne raščlanjuj' u tabeli stavki protiv te sirovine."
@@ -32998,7 +33061,7 @@ msgstr "Napomena: Ovaj troškovni centar je grupa. Nije moguće napraviti račun
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr "Napomena: Da biste spojili stavke, kreirajte zasebno usklađivanje zaliha za stariju stavku {0}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr "Napomena: {0}"
@@ -33014,6 +33077,7 @@ msgstr "Napomena: {0}"
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33449,6 +33513,12 @@ msgstr "Samo su nezavisni čvorovi dozvoljeni u transakcijama"
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr "Može se kreirati samo jedan {0} unos protiv radnog naloga {1}"
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr "Isključivo unosi uplate kod kojih opcija za primenu poreza po odbitku nije označena biće uzeta u obzir prilikom provere prekoračenja kumulativnog praga"
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33651,8 +33721,8 @@ msgstr "Početno stanje (Duguje)"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr "Početna akumulirana amortizacija"
@@ -33694,7 +33764,7 @@ msgstr "Početni datum"
msgid "Opening Entry"
msgstr "Unos početnog stanja"
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr "Unos početnog stanja ne može biti kreiran nakon što je kreiran dokument za zatvaranje perioda."
@@ -33722,7 +33792,7 @@ msgid "Opening Invoice Item"
msgstr "Stavka početne fakture"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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."
@@ -33796,7 +33866,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:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr "Operativni trošak prema radnom nalogu / sastavnici"
@@ -33952,7 +34022,7 @@ msgstr "Operacije"
msgid "Operations Routing"
msgstr "Raspored operacija"
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr "Polje za operacije ne može ostati prazno"
@@ -34544,7 +34614,7 @@ msgstr "Dozvola za prekoračenje isporuke/prijema (%)"
msgid "Over Picking Allowance"
msgstr "Dozvola za preuzimanje viška"
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr "Prekoračenje prijema"
@@ -34996,7 +35066,7 @@ msgstr "Upakovana stavka"
msgid "Packed Items"
msgstr "Upakovane stavke"
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr "Upakovane stavke ne mogu biti deo internog prenosa"
@@ -35031,7 +35101,7 @@ msgstr "Dokument liste pakovanja"
msgid "Packing Slip Item"
msgstr "Stavka na dokumentu liste pakovanja"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr "Dokument(a) liste pakovanja je otkazan"
@@ -35117,7 +35187,7 @@ msgstr "Plaćeno"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35392,7 +35462,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:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr "Delimična rezervacija zaliha"
@@ -35586,9 +35656,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35749,9 +35819,9 @@ 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35916,7 +35986,7 @@ msgstr "Podešavanje platioca"
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -36052,7 +36122,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr "Unos uplate je izmenjen nakon što ste ga povukli. Molimo Vas da ga ponovo povučete."
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr "Unoć uplate je već kreiran"
@@ -36261,7 +36331,7 @@ msgstr "Reference plaćanja"
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36287,11 +36357,11 @@ msgstr "Vrsta zahteva za naplatu"
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr "Zahtev za naplatu je kreiran iz prodajne ili nabavne porudžbine i biće u statusu nacrta. Kada se onemogući, dokument će biti u nesačuvanom statusu."
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr "Zahtev za naplatu za {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr "Zahtev za naplatu je već kreiran"
@@ -36449,7 +36519,7 @@ msgstr "URL plaćanja"
msgid "Payment Unlink Error"
msgstr "Greška prilikom poništavanja plaćanja"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
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}"
@@ -36770,7 +36840,7 @@ msgstr "Period"
msgid "Period Based On"
msgstr "Period zasnovan na"
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr "Period zatvoren"
@@ -37373,7 +37443,7 @@ msgstr "Molimo Vas da dodate račun za osnovni nivo kompanije - {}"
msgid "Please add {1} role to user {0}."
msgstr "Molimo Vas da dodate ulogu {1} korisniku {0}."
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr "Molimo Vas da prilagodite količinu ili izmenite {0} za nastavak."
@@ -37381,7 +37451,7 @@ msgstr "Molimo Vas da prilagodite količinu ili izmenite {0} za nastavak."
msgid "Please attach CSV file"
msgstr "Molimo Vas da priložite CSV fajl"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr "Molimo Vas da otkažete i izmenite unos uplate"
@@ -37394,7 +37464,7 @@ msgstr "Molimo Vas da prvo ručno otkažete unos uplate"
msgid "Please cancel related transaction."
msgstr "Molimo Vas da otkažete povezanu transakciju."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr "Molimo Vas da proverite opciju za više valuta da biste omogućili račune sa drugim valutama"
@@ -37471,7 +37541,7 @@ msgstr "Molimo Vas da kreirate prijemnicu nabavke ili ulaznu fakturu za stavku {
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr "Molimo Vas da obrišete proizvodnu kombinaciju {0}, pre nego što spojite {1} u {2}"
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr "Molimo Vas da privremeno onemogućite radni tok za nalog knjiženja {0}"
@@ -37595,7 +37665,7 @@ msgstr "Molimo Vas da prvo unesete prijemnicu nabavke"
msgid "Please enter Receipt Document"
msgstr "Molimo Vas da unesete dokument prijema"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr "Molimo Vas da unesete datum reference"
@@ -37720,8 +37790,8 @@ msgstr "Molimo Vas da se uverite da li zaista želite da obrišete transakcije z
msgid "Please mention 'Weight UOM' along with Weight."
msgstr "Molimo Vas da navedete 'Jedinica mere za težinu' zajedno sa težinom."
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr "Molimo Vas da navedete '{0}' u kompaniji: {1}"
@@ -37849,7 +37919,7 @@ 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:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr "Molimo Vas da izaberete cenovnik"
@@ -37881,7 +37951,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr "Molimo Vas da izaberete sastavnicu"
@@ -37971,6 +38041,10 @@ 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
+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
msgid "Please select atleast one item to continue"
msgstr "Molimo Vas da izaberete barem jednu stavku da biste nastavili"
@@ -37979,7 +38053,7 @@ msgstr "Molimo Vas da izaberete barem jednu stavku da biste nastavili"
msgid "Please select atleast one operation to create Job Card"
msgstr "Molimo Vas da izaberete barem jednu operaciju za kreiranje radne kartice"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr "Molimo Vas da izaberete ispravan račun"
@@ -38060,15 +38134,15 @@ msgstr "Molimo Vas da prvo izaberete {0}"
msgid "Please set 'Apply Additional Discount On'"
msgstr "Molimo Vas da postavite 'Primeni dodatni popust na'"
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr "Molimo Vas da postavite 'Troškovni centar amortizacije imovine' u kompaniji {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr "Molimo Vas da postavite 'Račun prihod/rashod prilikom otuđenja imovine' u kompaniji {0}"
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr "Molimo Vas da postavite '{0}' u kompaniji: {1}"
@@ -38076,7 +38150,7 @@ msgstr "Molimo Vas da postavite '{0}' u kompaniji: {1}"
msgid "Please set Account"
msgstr "Molimo Vas da postavite račun"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr "Molimo Vas da postavite račun za razliku u iznosu"
@@ -38102,7 +38176,7 @@ msgstr "Molimo Vas da postavite računovodstvenu dimenziju {} u {}"
msgid "Please set Company"
msgstr "Molimo Vas da postavite kompaniju"
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: 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}"
@@ -38120,7 +38194,7 @@ msgstr "Molimo Vas da postavite fiskalniu šifru za kupca '%s'"
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr "Molimo Vas da postavite fiskalnu šifru za javnu upravu '%s'"
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr "Molimo Vas da postavite račun osnovnih sredstava u kategoriji imovine {0}"
@@ -38183,7 +38257,7 @@ msgstr "Molimo Vas da postavite račun u skladištu {0}"
msgid "Please set an Address on the Company '%s'"
msgstr "Molimo Vas da postavite adresu na kompaniju '%s'"
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr "Molimo Vas da postavite račun rashoda u tabelu stavki"
@@ -38199,23 +38273,23 @@ msgstr "Molimo Vas da postavite bar jedan red u tabeli poreza i taksi"
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr "Molimo Vas da postavite ili poresku ili fiskalnu šifru za kompaniju {0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr "Molimo Vas da postavite kao podrazumevano blagajnu ili tekući račun u načinu plaćanja {0}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr "Molimo Vas da postavite kao podrazumevano blagajnu ili tekući račun u načinu plaćanja {}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
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:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr "Molimo Vas da postavite podrazumevani račun prihoda/rashoda kursnih razlika u kompaniji {}"
@@ -38319,7 +38393,7 @@ msgstr "Molimo Vas da postavite {0} u {1}, isti račun koji je korišćen u orig
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr "Molimo Vas da postavite i omogućite grupni račun sa vrstom računa - {0} za kompaniju {1}"
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr "Molimo Vas da podelite ovaj imejl sa Vašim timom za podršku kako bi mogli pronaći i rešiti problem."
@@ -38332,7 +38406,7 @@ 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:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr "Molimo Vas da precizirate kompaniju da biste nastavili"
@@ -38505,6 +38579,7 @@ msgstr "Poštanski troškovi"
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38539,11 +38614,11 @@ 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38562,6 +38637,7 @@ msgstr "Poštanski troškovi"
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38571,6 +38647,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_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
@@ -39136,6 +39213,14 @@ msgstr "Šifra stavke pravila za cene"
msgid "Pricing Rule Item Group"
msgstr "Grupa stavki pravila za cene"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr "Cenovno pravilo se prvo bira na osnovu polja 'Primeni na', koje može biti stavka, grupa stavki ili brend."
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr "Cenovno pravilo je napravljeno da zameni cenovnik ili definiše procenat popusta, na osnovu nekih kriterijuma."
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr "Pravilo cena {0} je ažurirano"
@@ -39194,6 +39279,10 @@ msgstr "Pravilo cena {0} je ažurirano"
msgid "Pricing Rules"
msgstr "Cenovna pravila"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr "Cenovna pravila se dalje filtriraju na osnovu količine."
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39581,7 +39670,7 @@ msgstr "Opis procesa"
msgid "Process Loss"
msgstr "Gubitak u procesu"
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr "Procenat gubitka u procesu ne može biti veći od 100"
@@ -40071,7 +40160,7 @@ msgstr "Napredak (%)"
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40546,7 +40635,7 @@ msgstr "Analitika nabavke"
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr "Datum nabavke"
@@ -40702,7 +40791,7 @@ msgstr "Glavni mendžer za nabavku"
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40878,9 +40967,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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41761,6 +41850,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/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
@@ -41877,7 +41967,7 @@ msgstr "Količina ne sme biti veća od {0}"
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr "Količina stavki dobijena nakon proizvodnje / prepakovanja od zadatih količina sirovina"
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr "Potrebna količina za stavku {0} u redu {1}"
@@ -42726,7 +42816,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:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "Razlog za stavljanje na čekanje"
@@ -43162,7 +43252,7 @@ msgstr "Iskoristi protiv"
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr "Iskorišćeni poeni lojalnosti"
@@ -43294,7 +43384,7 @@ msgstr "Referentni datum"
msgid "Reference"
msgstr "Referenca"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr "Referenca #{0} od {1}"
@@ -43432,7 +43522,7 @@ msgstr "Naziv reference"
msgid "Reference No"
msgstr "Broj reference"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr "Broj reference i datum reference su obavezni za {0}"
@@ -43440,11 +43530,11 @@ msgstr "Broj reference i datum reference su obavezni za {0}"
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr "Broj reference i datum reference su obavezni za bankarsku transakciju"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr "Broj reference je obavezan ako ste uneli datum reference"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr "Broj reference."
@@ -43558,11 +43648,11 @@ msgstr "Referenca: {0}, šifra stavke: {1} i kupac: {2}"
msgid "References"
msgstr "Reference"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr "Reference za izlazne fakture su nepotpune"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr "Reference za prodajne porudžbine su nepotpune"
@@ -43707,8 +43797,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43727,7 +43817,7 @@ msgstr "Datum razduženja"
msgid "Remaining"
msgstr "Preostalo"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr "Preostali iznos"
@@ -43740,7 +43830,7 @@ msgstr "Preostali saldo"
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr "Napomena"
@@ -43789,7 +43879,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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -44101,7 +44191,7 @@ msgstr "Ponovno objavljivanje stavki u evidenciji uplata"
msgid "Repost Status"
msgstr "Status ponovnog objavljivanja"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr "Ponovno objavljivanje je započeto u pozadini"
@@ -44425,7 +44515,7 @@ msgstr "Ponovo izaberite, ukoliko je izabrani kontakt izmenjen nakon čuvanja"
msgid "Reseller"
msgstr "Preprodavac"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr "Ponovo pošaljite imejl o uplati"
@@ -44894,7 +44984,7 @@ msgstr "Povraćaj"
msgid "Return / Credit Note"
msgstr "Povraćaj / Dokument o smanjenju"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr "Povraćaj / Dokument o povećanju"
@@ -45418,12 +45508,12 @@ 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/sales_invoice/sales_invoice.py:1920
+#: 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/sales_invoice/sales_invoice.py:1915
+#: 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"
@@ -45569,7 +45659,7 @@ msgstr "Red #{0}: Dupli unos u referencama {1} {2}"
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr "Red #{0}: Očekivani datum isporuke ne može biti pre datuma nabavne porudžbine"
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr "Red #{0}: Račun rashoda nije postavljen za stavku {1}. {2}"
@@ -45593,11 +45683,11 @@ msgstr "Red #{0}: Gotov proizvod mora biti {1}"
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr "Red #{0}: Referenca za gotov proizvod je obavezna za otpisanu stavku {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr "Red #{0}: Za {1}, možete izabrati referentni dokument samo ukoliko se iznos postavi na potražnu stranu računa"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr "Red #{0}: Za {1}, možete izabrati referentni dokument samo ukoliko se iznos postavi na dugovnu stranu računa"
@@ -45617,7 +45707,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:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
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."
@@ -45653,7 +45743,7 @@ 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:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr "Red #{0}: Samo {1} je dostupno za rezervaciju za stavku {2}"
@@ -45698,15 +45788,15 @@ msgstr "Red #{0}: Količina mora biti pozitivan broj"
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}."
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr "Red #{0}: Inspekcija kvaliteta je neophodna za stavku {1}"
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr "Red #{0}: Inspekcija kvaliteta {1} nije podneta za stavku: {2}"
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr "Red #{0}: Inspekcija kvaliteta {1} je odbijena za stavku {2}"
@@ -45715,7 +45805,7 @@ msgstr "Red #{0}: Inspekcija kvaliteta {1} je odbijena za stavku {2}"
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:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
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."
@@ -45812,19 +45902,19 @@ msgstr "Red #{0}: Status mora biti {1} za diskontovanje fakture {2}"
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
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:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
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:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
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:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
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}."
@@ -45832,8 +45922,8 @@ msgstr "Red #{0}: Zalihe su već rezervisane za stavku {1} u skladištu {2}."
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
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}."
@@ -46014,7 +46104,7 @@ msgstr "Red {0}# stavka {1} nije pronađena u tabeli 'Primljene sirovine' u {2}
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr "Red {0}: Prihvaćena količina i odbijena količina ne mogu biti nula istovremeno."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr "Red {0}: {1} i vrsta stranke {2} imaju različite vrste računa"
@@ -46022,11 +46112,11 @@ msgstr "Red {0}: {1} i vrsta stranke {2} imaju različite vrste računa"
msgid "Row {0}: Activity Type is mandatory."
msgstr "Red {0}: Vrsta aktivnosti je obavezna."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr "Red {0}: Avans protiv kupca mora biti na potražnoj strani"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr "Red {0}: Avans protiv dobavljača mora biti na dugovnoj strani"
@@ -46046,7 +46136,7 @@ msgstr "Red {0}: Pošto je {1} omogućen, sirovine ne mogu biti dodate u {2} uno
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr "Red {0}: Sastavnica nije pronađena za stavku {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr "Red {0}: Dugovna i potražna strana ne mogu biti nula"
@@ -46062,7 +46152,7 @@ msgstr "Red {0}: Troškovni centar {1} ne pripada kompaniji {2}"
msgid "Row {0}: Cost center is required for an item {1}"
msgstr "Red {0}: Troškovni centar je obavezan za stavku {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr "Red {0}: Unos potražne strane ne može biti povezan sa {1}"
@@ -46070,7 +46160,7 @@ msgstr "Red {0}: Unos potražne strane ne može biti povezan sa {1}"
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr "Red {0}: Valuta za sastavnicu #{1} treba da bude jednaka izabranoj valuti {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr "Red {0}: Unos dugovne strane ne može biti povezan sa {1}"
@@ -46086,7 +46176,7 @@ msgstr "Red {0}: Datum dospeća u tabeli uslova plaćanja ne može biti pre datu
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr "Red {0}: Stavka iz otpremnice ili referenca upakovane stavke je obavezna."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "Red {0}: Devizni kurs je obavezan"
@@ -46120,7 +46210,7 @@ msgstr "Red {0}: Vreme početka i vreme završetka su obavezni."
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr "Red {0}: Vreme početka i vreme završetka za {1} se preklapaju sa {2}"
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr "Red {0}: Početno skladište je obavezno za interne transfere"
@@ -46132,7 +46222,7 @@ msgstr "Red {0}: Vreme početka mora biti manje od vremena završetka"
msgid "Row {0}: Hours value must be greater than zero."
msgstr "Red {0}: Vrednost časova mora biti veća od nule."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr "Red {0}: Nevažeća referenca {1}"
@@ -46156,7 +46246,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr "Red {0}: Upakovana količina mora biti jednaka količini {1}."
@@ -46164,7 +46254,7 @@ msgstr "Red {0}: Upakovana količina mora biti jednaka količini {1}."
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr "Red {0}: Dokument liste pakovanja je već kreiran za stavku {1}."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr "Red {0}: Stranka / Račun se ne podudara sa {1} / {2} u {3} {4}"
@@ -46176,11 +46266,11 @@ msgstr "Red {0}: Vrsta stranke i stranka su obavezni za račun potraživanja / o
msgid "Row {0}: Payment Term is mandatory"
msgstr "Red {0}: Uslov plaćanja je obavezan"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr "Red {0}: Plaćanje na osnovu prodajne/nabavne porudžbine uvek treba označiti kao avans"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr "Red {0}: Molimo Vas da označite opciju 'Avans' za račun {1} ukoliko je ovo avansni unos."
@@ -46248,7 +46338,7 @@ msgstr "Red {0}: Promenu nije moguće sprovesti jer je amortizacija već obrađe
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr "Red {0}: Podugovorena stavka je obavezna za sirovinu {1}"
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr "Red {0}: Ciljano skladište je obavezno za interne transfere"
@@ -46272,7 +46362,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:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: 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}"
@@ -46293,7 +46383,7 @@ msgstr "Red {0}: {1} mora biti veće od 0"
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr "Red {0}: {1} {2} ne može biti isto kao {3} (Račun stranke) {4}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr "Red {0}: {1} {2} se ne podudara sa {3}"
@@ -46686,7 +46776,7 @@ msgstr "Izlazna faktura nije kreirana od strane korisnika {}"
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:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr "Izlazna faktura {0} je već podneta"
@@ -46915,7 +47005,7 @@ msgstr "Status prodajne porudžbine"
msgid "Sales Order Trends"
msgstr "Trendovi prodajne porudžbine"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr "Prodajna porudžbina je potrebna za stavku {0}"
@@ -47425,8 +47515,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47699,7 +47789,7 @@ msgstr "Cena materijala otpisa (valuta kompanije)"
msgid "Scrap Warehouse"
msgstr "Skladište za otpis"
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr "Datum otpisa ne može biti pre datuma nabavke"
@@ -47772,7 +47862,7 @@ msgstr "Sekretar"
msgid "Section"
msgstr "Odeljak"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr "Šifra odeljka"
@@ -48143,7 +48233,7 @@ msgstr "Izaberite, kako bi kupac mogao da bude pronađen u ovim poljima"
msgid "Selected POS Opening Entry should be open."
msgstr "Izabrani unos početnog stanja za maloprodaju treba da bude otvoren."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr "Izabrani cenovnik treba da ima označena polja za nabavku i prodaju."
@@ -48327,7 +48417,7 @@ msgstr "Pošalji sa prilogom"
msgid "Sender"
msgstr "Pošiljalac"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr "Slanje"
@@ -48451,7 +48541,9 @@ msgstr "Brojevi serije / šarže"
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48482,7 +48574,9 @@ msgid "Serial No Count"
msgstr "Broj serijskih brojeva"
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr "Dnevnik brojeva serija"
@@ -48490,7 +48584,7 @@ msgstr "Dnevnik brojeva serija"
msgid "Serial No Range"
msgstr "Opseg serijskih brojeva"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr "Rezervisani broj serije"
@@ -48530,6 +48624,13 @@ msgstr "Broj serije i šarža"
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr "Selektor broja serije i šarže ne može biti korišćen kada je opcija koristi polja za seriju / šaržu omogućena."
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr "Pratljivost broja serije i šarže"
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr "Broj serije je obavezan"
@@ -48559,7 +48660,7 @@ msgstr "Broj serije {0} ne pripada stavci {1}"
msgid "Serial No {0} does not exist"
msgstr "Broj serije {0} ne postoji"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr "Broj serije {0} ne postoji"
@@ -48608,7 +48709,7 @@ msgstr "Brojevi serije / Brojevi šarže"
msgid "Serial Nos and Batches"
msgstr "Brojevi serije i šarže"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr "Brojevi serije su uspešno kreirani"
@@ -48686,11 +48787,11 @@ msgstr "Serija i šarža"
msgid "Serial and Batch Bundle"
msgstr "Paket serije i šarže"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr "Paket serije i šarže je kreiran"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr "Paket serije i šarže je ažuriran"
@@ -49124,7 +49225,7 @@ msgstr "Postavi ukupne troškove na osnovu cene ulazne fakture"
msgid "Set Loyalty Program"
msgstr "Postavi program lojalnosti"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr "Postavi novi datum izdavanja"
@@ -49379,7 +49480,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:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr "Podešavanje {0} je neophodno"
@@ -49563,7 +49664,7 @@ msgstr "Vrsta pošiljke"
msgid "Shipment details"
msgstr "Detalji isporuke"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr "Isporuke"
@@ -49810,6 +49911,10 @@ msgstr "Prikaži otkazane unose"
msgid "Show Completed"
msgstr "Prikaži završeno"
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr "Prikaži potražuje / duguje u valuti kompanije"
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr "Prikaži kumulativni iznos"
@@ -49925,7 +50030,7 @@ msgstr "Prikaži pregled"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr "Prikaži napomene"
@@ -50232,13 +50337,27 @@ msgstr "Izvor"
msgid "Source DocType"
msgstr "Izvorni DocType"
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr "Izvorni dokument"
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr "Naziv izvornog dokumenta"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr "Broj izvornog dokumenta"
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr "Vrsta izvornog dokumenta"
@@ -50309,7 +50428,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:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr "Izvorno skladište je obavezno za stavku {0}."
@@ -50820,7 +50939,7 @@ msgstr "Svojstva stanja"
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51163,7 +51282,7 @@ msgstr "Unos zaliha {0} kreiran"
msgid "Stock Entry {0} has created"
msgstr "Unos zaliha {0} je kreiran"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr "Unos zaliha {0} nije podnet"
@@ -51386,13 +51505,13 @@ msgstr "Podešavanje ponovne obrade zaliha"
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51401,13 +51520,13 @@ msgstr "Podešavanje ponovne obrade zaliha"
msgid "Stock Reservation"
msgstr "Rezervacija zaliha"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr "Unosi rezervacije zaliha otkazani"
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr "Unosi rezervacije zaliha kreirani"
@@ -51429,7 +51548,7 @@ msgstr "Unos rezervacije zaliha ne može biti ažuriran jer su zalihe isporučen
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:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr "Nepodudaranje skladišta za rezervaciju zaliha"
@@ -51674,7 +51793,7 @@ 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:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr "Zalihe ne mogu biti rezervisane u grupnom skladištu {0}."
@@ -51690,7 +51809,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr "Poništeno je rezervisanje zaliha za radni nalog {0}."
@@ -52558,10 +52677,15 @@ 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "Dobavljač"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr "Dobavljač > Vrsta dobavljača"
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52674,7 +52798,7 @@ msgstr "Faktura dobavljača"
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr "Datum izdavanja fakture dobavljača"
@@ -52688,8 +52812,8 @@ 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "Broj fakture dobavljača"
@@ -53236,16 +53360,16 @@ msgstr "Sistem neće proveravati naplatu jer je iznos za stavku {0} u {1} nula"
msgid "System will notify to increase or decrease quantity or amount "
msgstr "Sistem će izvršiti obaveštavanje u slučaju povećanja ili smanjenja količine ili iznosa "
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr "Iznos poreza prikupljenog na izvoru"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr "Stopa poreza prikupljenog na izvoru %"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr "Iznos poreza odbijenog na izvoru"
@@ -53262,7 +53386,7 @@ msgstr "Odbijen porez po odbitku na izvoru"
msgid "TDS Payable"
msgstr "Obaveza za porez koji je odbijen na izvoru"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr "Stopa poreza koji je odbijen na izvoru %"
@@ -53818,7 +53942,7 @@ msgstr "Vrsta poreza"
msgid "Tax Withheld Vouchers"
msgstr "Poreski dokument sa porezom po odbitku"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr "Porez po odbitku"
@@ -54444,7 +54568,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:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
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."
@@ -54472,7 +54596,7 @@ msgstr "Unosi u glavnu knjigu će biti otkazani u pozadini, ovo može potrajati
msgid "The Loyalty Program isn't valid for the selected company"
msgstr "Program lojalnosti nije važeći za izabranu kompaniju"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr "Zahtev za naplatu {0} je već plaćen, plaćanje se ne može obraditi dva puta"
@@ -54496,7 +54620,7 @@ msgstr "Prodavac je povezan sa {0}"
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr "Broj serije u redu #{0}: {1} nije dostupan u skladištu {2}."
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr "Serijski broj {0} je rezervisan za {1} {2} i ne može se koristiti za bilo koju drugu transakciju."
@@ -54518,7 +54642,7 @@ msgstr "Radni nalog je obavezan za nalog za demontažu"
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr "Analitički račun koji je obaveza ili kapital, na kom će dobitak ili gubitak biti knjižen"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr "Raspoređeni iznos je veći od neizmirenog iznosa u zahtevu za naplatu {0}"
@@ -54559,7 +54683,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:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr "Polje {0} u redu {1} nije postavljeno"
@@ -54575,7 +54699,7 @@ msgstr "Referentni brojevi se ne poklapaju"
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr "Sledeće stavke, koje imaju pravila skladištenja, nisu mogle biti raspoređene:"
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr "Sledeća imovina nije mogla automatski da postavi unose za amortizaciju: {0}"
@@ -54836,6 +54960,10 @@ msgstr "{0} {1} se ne podudara sa {0} {2} u {3} {4}"
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr "{0} {1} se korsiti za izračunavanje vrednosti troškova za gotov proizvod {2}."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
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."
@@ -55102,7 +55230,7 @@ msgstr "Ovaj raspored je kreiran kada je imovina {0} vraćena zbog otkazivanja i
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr "Ovaj raspored je kreiran kada je imovina {0} vraćena nakon poništavanja kapitalizacije imovine {1}."
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr "Ovaj raspored je kreiran kada je imovina {0} vraćena."
@@ -55110,7 +55238,7 @@ msgstr "Ovaj raspored je kreiran kada je imovina {0} vraćena."
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr "Ovaj raspored je kreiran kada je imovina {0} vraćena putem izlazne fakture {1}."
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr "Ovaj raspored je kreiran kada je imovina {0} otpisana."
@@ -55885,6 +56013,10 @@ msgstr "Da bi porez bio uključen u red {0} u ceni stavke, porezi u redovima {1}
msgid "To merge, following properties must be same for both items"
msgstr "Za spajanje, sledeće osobine moraju biti iste za obe stavke"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr "Da se cenovno pravilo ne primeni u određenoj transakciji, sva primenjiva cenovna pravila treba onemogućiti."
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr "Da biste ovo poništili, omogućite '{0}' u kompaniji {1}"
@@ -55902,7 +56034,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr "Da biste podneli fakturu bez prijemnica nabavke, molimo Vas da postavite {0} kao {1} u {2}"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr "Da biste koristili drugu finansijsku evidenciju, poništite označavanje opcije 'Uključi podrazumevanu imovinu u finansijskim evidencijama'"
@@ -56124,7 +56256,7 @@ msgstr "Ukupne raspodele"
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56286,7 +56418,7 @@ msgstr "Ukupan iznos potražuje/duguje treba da bude isti kao u nalogu knjiženj
msgid "Total Debit"
msgstr "Ukupno duguje"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr "Ukupan iznos duguje mora da bude jednak ukupnom iznsou potražuje. Razlika je {0}"
@@ -56879,6 +57011,10 @@ msgstr "Ukupno"
msgid "Traceability"
msgstr "Pratljivost"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr "Pravac pratljivosti"
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56919,7 +57055,7 @@ msgstr "URL za praćenje"
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -57017,7 +57153,7 @@ msgstr "Podešavanje transakcije"
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr "Vrsta transakcije"
@@ -57039,7 +57175,7 @@ msgstr "Referenca transakcije broj {0} od {1}"
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57636,7 +57772,11 @@ msgstr "Neraspoređeni iznos"
msgid "Unassigned Qty"
msgstr "Nedodeljena količina"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr "Nefakturisane porudžbine"
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr "Odblokiraj fakturu"
@@ -59003,7 +59143,7 @@ msgstr "Faktura dobavljača"
msgid "Vendor Invoices"
msgstr "Fakture dobavljača"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr "Naziv dobavljača"
@@ -59070,7 +59210,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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59261,11 +59401,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59300,7 +59440,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr "Podvrsta dokumenta"
@@ -59332,9 +59472,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59353,6 +59493,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_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
@@ -59562,6 +59703,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_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
@@ -59670,7 +59812,7 @@ msgstr "Skladište i referenca"
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr "Skladište ne može biti obrisano jer postoje unosi u knjigu zaliha za ovo skladište."
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr "Skladište ne može biti promenjeno za broj serije."
@@ -59683,7 +59825,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:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr "Skladište je obavezno za stavku zaliha {0}"
@@ -59834,7 +59976,7 @@ msgstr "Upozorenje na negativno stanje zaliha"
msgid "Warning!"
msgstr "Upozorenje!"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr "Upozorenje: Još jedan {0} # {1} postoji u odnosu na unos zaliha {2}"
@@ -60317,6 +60459,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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "Radni nalog"
@@ -60792,7 +60935,7 @@ msgstr "Uvozite podatke za listu šifara:"
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr "Niste ovlašćeni da ažurirate prema uslovima postavljenim u radnom toku {}."
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr "Niste ovlašćeni da dodajete ili ažurirate unose pre {0}"
@@ -60824,7 +60967,7 @@ msgstr "Takođe možete postaviti podrazumevani račun za građevinske radove u
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr "Možete promeniti matični račun u račun bilansa stanja ili izabrati drugi račun."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr "Ne možete uneti trenutni dokument u kolonu 'Protiv nalog knjiženja'"
@@ -60841,7 +60984,7 @@ msgstr "Možete iskoristiti maksimalno {0} poena u ovoj naruždbini."
msgid "You can only select one mode of payment as default"
msgstr "Možete izabrati samo jedan način plaćanja kao podrazumevani"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr "Možete iskoristiti do {0}."
@@ -60873,11 +61016,11 @@ msgstr "Ne možete kreirati {0} unutar zatvorenog računovodstvenog perioda {1}"
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr "Ne možete kreirati ili otkazati nikakve računovodstvene unose u zatvorenom računovodstvenom periodu {0}"
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr "Ne možete kreirati/izmeniti računovodstvene unose do ovog datuma."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr "Ne možete istovremeno knjižiti dugovnu i potražnu stranu na istom računu"
@@ -60893,7 +61036,7 @@ msgstr "Ne možete uređivati korenski čvor."
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr "Ne možete omogućiti oba podešavanja '{0}' i '{1}'."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr "Ne možete iskoristiti više od {0}."
@@ -60925,7 +61068,7 @@ msgstr "Nemate dozvolu da {} stavke u {}."
msgid "You don't have enough Loyalty Points to redeem"
msgstr "Nemate dovoljno poena lojalnosti da biste ih iskoristili"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr "Nemate dovoljno poena da biste ih iskoristili."
@@ -61351,7 +61494,7 @@ msgstr "naslov"
msgid "to"
msgstr "ka"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr "da biste raspodelili iznos ove reklamacione fakture pe njenog otkazivanja."
@@ -61391,7 +61534,7 @@ msgstr "{0}"
msgid "{0} '{1}' is disabled"
msgstr "{0} '{1}' je onemogućen"
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr "{0} '{1}' nije u fiskalnoj godini {2}"
@@ -61423,7 +61566,7 @@ msgstr "{0} kupona iskorišćeno za {1}. Dozvoljena količina je iskorišćena"
msgid "{0} Digest"
msgstr "{0} Izveštaj"
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr "{0} broj {1} već korišćen u {2} {3}"
@@ -61439,7 +61582,7 @@ msgstr "{0} zahtev za {1}"
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr "{0} zadržavanje uzorka se zasniva na šarži, molimo Vas da proverite da li stavka ima broj šarže kako biste zadržali uzorak"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr "{0} transakcija(e) usklađeno"
@@ -61455,19 +61598,19 @@ msgstr "{0} račun nije vrsta {1}"
msgid "{0} account not found while submitting purchase receipt"
msgstr "{0} nalog nije pronađen prilikom podnošenja prijemnice nabavke"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr "{0} prema računu {1} na datum {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr "{0} protiv nabavne porudžbine {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr "{0} protiv izlazne fakture {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr "{0} prema prodajnoj porudžbini {1}"
@@ -61475,7 +61618,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:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr "{0} i {1}"
@@ -61534,7 +61677,7 @@ msgstr "{0} unet dva puta u stavke poreza"
msgid "{0} entered twice {1} in Item Taxes"
msgstr "{0} unet dva puta {1} u stavke poreza"
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr "{0} za {1}"
@@ -61587,7 +61730,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr "{0} je obavezno za stavku {1}"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr "{0} je obavezno za račun {1}"
@@ -61662,7 +61805,7 @@ msgstr "{0} stavki proizvedeno"
msgid "{0} must be negative in return document"
msgstr "{0} mora biti negativan u povratnom dokumentu"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr "{0} nije dozvoljena transakcija sa {1}. Molimo Vas da promenite kompaniju ili da dodate kompaniju u odeljak 'Dozvoljene transakcije sa' u zapisu kupca."
@@ -61678,7 +61821,7 @@ msgstr "Parametar {0} je nevažeći"
msgid "{0} payment entries can not be filtered by {1}"
msgstr "Unosi plaćanja {0} ne mogu se filtrirati prema {1}"
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr "Količina {0} za stavku {1} se prima u skladište {2} sa kapacitetom {3}."
@@ -61739,7 +61882,7 @@ msgstr "{0} {1}"
msgid "{0} {1} Manually"
msgstr "{0} {1} ručno"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr "{0} {1} delimično usklađeno"
@@ -61804,7 +61947,7 @@ msgstr "{0} {1} je otkazano ili zaustavljeno"
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr "{0} {1} je otkazano, samim tim radnja se ne može završiti"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr "{0} {1} je zatvoreo"
@@ -61816,7 +61959,7 @@ msgstr "{0} {1} je onemogućeno"
msgid "{0} {1} is frozen"
msgstr "{0} {1} je zaključano"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr "{0} {1} je u potpunosti fakturisano"
@@ -61828,12 +61971,12 @@ msgstr "{0} {1} nije aktivno"
msgid "{0} {1} is not associated with {2} {3}"
msgstr "{0} {1} nije povezano sa {2} {3}"
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr "{0} {1} nije ni u jednoj aktivnoj fiskalnoj godini"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr "{0} {1} nije podneto"
@@ -61845,7 +61988,7 @@ msgstr "{0} {1} je na čekanju"
msgid "{0} {1} must be submitted"
msgstr "{0} {1} mora biti podneto"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr "{0} {1} nije dozvoljena ponovna obrada. Izmenite {2} da biste omogućili ponovnu obradu."
@@ -61880,7 +62023,7 @@ msgstr "{0} {1}: račun {2} je neaktivan"
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr "{0} {1}: računovodstveni unos {2} može biti napravljen samo u valuti: {3}"
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr "{0} {1}: troškovni centar je obavezan za stavku {2}"
@@ -61958,7 +62101,7 @@ msgstr "{doctype} {name} je otkazano ili zatvoreno."
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr "{field_label} je obavezno za podugovoreni posao {doctype}."
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr "Veličina uzorka za {item_name} ({sample_size}) ne može biti veća od prihvaćene količine ({accepted_quantity})"
@@ -61966,7 +62109,7 @@ msgstr "Veličina uzorka za {item_name} ({sample_size}) ne može biti veća od p
msgid "{ref_doctype} {ref_name} is {status}."
msgstr "{ref_doctype} {ref_name} je {status}."
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr "{}"
@@ -62024,7 +62167,7 @@ msgstr "{} na čekanju"
msgid "{} To Bill"
msgstr "{} za fakturisanje"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr "{} ne može biti otkazano jer su zarađeni poeni lojalnosti iskorišćeni. Prvo otkažite {} broj {}"
diff --git a/erpnext/locale/sv.po b/erpnext/locale/sv.po
index c0edec12e57..03a7238c313 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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-10 17:10\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:06\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Swedish\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr " Artikel"
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr "\"Dagar sedan senaste order\" måste vara högre än eller lika med noll
msgid "'Default {0} Account' in Company {1}"
msgstr "\"Standard {0} Konto\" i Bolag {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr "'Poster' kan inte vara tom"
@@ -920,11 +920,11 @@ msgstr "Genvägar\n"
msgid "Your Shortcuts"
msgstr "Genvägar"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr "Totalt Belopp: {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr "Utestående belopp: {0}"
@@ -1319,10 +1319,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1627,7 +1627,7 @@ msgstr "Konto {0}: Överordnad Konto {1} finns inte"
msgid "Account {0}: You can not assign itself as parent account"
msgstr "Konto: {0}: Kan inte tilldela konto som sitt överordnad konto"
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr "Konto: {0} är Kapitalarbete pågår och kan inte uppdateras av Journal Post"
@@ -2116,7 +2116,7 @@ msgstr "Konton Låsta Till"
msgid "Accounts Manager"
msgstr "Bokföring Ansvarig"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr "Konton Saknas Fel"
@@ -2303,7 +2303,7 @@ msgstr "Bokföring Inställningar"
msgid "Accounts User"
msgstr "Bokföring Användare"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr "Bokföring Tabell kan inte vara tom."
@@ -2663,6 +2663,10 @@ msgstr "Faktisk Slut Tid"
msgid "Actual Expense"
msgstr "Faktisk Kostnad"
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr "Faktiska Kostnader"
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2800,7 +2804,7 @@ msgstr "Lägg till / Ändra Priser"
msgid "Add Child"
msgstr "Lägg till Underval"
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr "Lägg till kolumner i Transaktion Valuta"
@@ -3606,7 +3610,7 @@ msgstr "Förskott Belopp"
msgid "Advance amount cannot be greater than {0} {1}"
msgstr "Förskott Belopp kan inte vara högre än {0} {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr "Förskott Betalning mot {0} {1} kan inte vara större än Totalt Belopp {2}"
@@ -3663,7 +3667,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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr "Mot Konto"
@@ -3732,7 +3736,7 @@ msgstr "Mot Kostnad Konto"
msgid "Against Income Account"
msgstr "Mot Intäkt Konto"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr "Mot Journal Post {0} som inte har någon oavstämd {1} post"
@@ -3780,7 +3784,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr "Mot Verifikat"
@@ -3792,7 +3796,7 @@ msgstr "Mot Verifikat"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr "Mot Verifikat Nummer"
@@ -3804,8 +3808,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr "Mot Verifikat Typ"
@@ -3931,7 +3935,7 @@ msgstr "Alla"
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr "Kontoplan"
@@ -4099,7 +4103,7 @@ msgstr "Alla artiklar är redan efterfrågade"
msgid "All items have already been Invoiced/Returned"
msgstr "Alla Artiklar är redan Fakturerade / Återlämnade"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr "Alla Artiklar är redan mottagna"
@@ -4125,7 +4129,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:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr "Alla Artiklar är redan Fakturerade / Återlämnade"
@@ -5011,7 +5015,7 @@ msgstr "Ändrad Från"
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5151,7 +5155,7 @@ msgstr "Belopp I Figur"
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr "Belopp i Konto Valuta"
@@ -5302,7 +5306,7 @@ msgstr "Annan Budget Post '{0}' finns redan mot {1} '{2}' och konto '{3}' för B
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr "Annan Resultat Enhet Tilldelning Post {0} är tillämplig från {1}, därför kommer denna tilldelning att gälla upp till {2}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr "En annan betalningsbegäran är redan behandlad"
@@ -5885,7 +5889,7 @@ msgstr "Tillgång Aktivering Lager Post"
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5927,7 +5931,7 @@ msgstr "Tillgång Avskrivning Schema"
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr "Tillgång Avskrivning Schema för Tillgång {0} och Finans Register {1} använder inte skift baserad avskrivning"
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr "Tillgång Avskrivning Schema finns inte för Tillgång {0} och Finans Register {1}"
@@ -5966,7 +5970,7 @@ msgstr "Tillgång Avyttring"
msgid "Asset Finance Book"
msgstr "Tillgång Finans Register"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr "Tillgång ID"
@@ -6042,7 +6046,7 @@ msgstr "Tillgång Förändring Post {0} skapad"
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr "Tillgång Namn"
@@ -6128,9 +6132,9 @@ msgstr "Tillgång Status"
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr "Tillgång Värde"
@@ -6159,7 +6163,7 @@ msgstr "Tillgång Annullerad"
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "Tillgång kan inte annulleras, eftersom det redan är {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr "Tillgång kan inte skrotas före senaste avskrivning post."
@@ -6191,7 +6195,7 @@ msgstr "Tillgång ur funktion på grund av reparation av Tillgång {0}"
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr "Tillgång mottagen på plats {0} och utfärdad till Personal {1}"
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr "Tillgång återställd"
@@ -6203,11 +6207,11 @@ msgstr "Tillgång återställd efter att Tillgång Aktivering {0} annullerats"
msgid "Asset returned"
msgstr "Tillgång återlämnad"
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr "Tillgång skrotad"
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr "Tillgång skrotad via Journal Post {0}"
@@ -6232,7 +6236,7 @@ msgstr "Tillgång uppdaterad efter att ha delats upp i Tillgång {0}"
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr "Tillgång uppdaterad på grund av Tillgång Reparation {0} {1}."
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr "Tillgång {0} kan inte skrotas, eftersom det redan är {1}"
@@ -6265,7 +6269,15 @@ msgstr "Tillgång {0} uppdaterad. Ange avskrivning detaljer och godkänn den."
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr "Tillgång {0} har {1} status och kan inte repareras."
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr "Tillgång {0} är inte angiven för att beräkna avskrivningar."
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr "Tillgång {0} är inte godkänd. Godkänn tillgång innan du fortsätter."
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr "Tillgång {0} måste godkännas"
@@ -6646,7 +6658,7 @@ msgstr "Automatiskt Avstämning"
msgid "Auto Reconcile Payments"
msgstr "Automatisk Betalning Avstämning"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr "Automatisk Avstämning"
@@ -6656,7 +6668,7 @@ msgstr "Automatisk Avstämning"
msgid "Auto Reconciliation Job Trigger"
msgstr "Automatisk Avstämning Jobb Utlösare"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr "Automatisk avstämning har startat i bakgrunden"
@@ -6831,7 +6843,7 @@ msgstr "Tillgänglig Parti Kvantitet på Lager"
msgid "Available Batch Report"
msgstr "Tillgänglig Parti Rapport"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr "Tillgängligt för Användning Datum"
@@ -7060,7 +7072,7 @@ msgstr "Stycklista"
msgid "BOM 1"
msgstr "Stycklista 1"
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "Stycklista 1 {0} och Stycklista 2 {1} ska inte vara lika"
@@ -7298,23 +7310,23 @@ msgstr "Stycklista innehåller inte någon Lager Artikel"
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr "Stycklista Rekursion: {0} kan inte vara underordnad till {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
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:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr "Stycklista {0} tillhör inte Artikel {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr "Stycklista {0} måste vara aktiv"
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr "Stycklista {0} måste godkännas"
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr "Stycklista {0} hittades inte för artikel {1}"
@@ -7385,7 +7397,7 @@ msgstr "Saldo"
msgid "Balance (Dr - Cr)"
msgstr "Saldo (Dr - Cr)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr "Saldo ({0})"
@@ -7864,7 +7876,7 @@ msgstr "Bas Pris"
msgid "Base Tax Withholding Net Total"
msgstr "Bas Netto Totalt Ex Moms "
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr "Bas Totalt"
@@ -8069,7 +8081,9 @@ msgstr "Parti Artikel Utgång Status"
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -8080,7 +8094,7 @@ msgstr "Parti Nummer"
msgid "Batch No is mandatory"
msgstr "Parti Nummer erfordras"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr "Parti Nummer {0} finns inte"
@@ -8103,7 +8117,7 @@ msgstr "Parti Nummer"
msgid "Batch Nos"
msgstr "Parti Nummer"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr "Parti Nummer Skapade"
@@ -8116,7 +8130,7 @@ msgstr "Parti Ej Tillgänglig för Retur"
msgid "Batch Number Series"
msgstr "Parti Namngivning Serie"
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr "Parti Kvantitet"
@@ -8229,7 +8243,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8542,8 +8556,8 @@ msgstr "Avtal Order Artikel"
msgid "Blanket Order Rate"
msgstr "Avtal Order Värde"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr "Spärra Faktura"
@@ -8659,7 +8673,7 @@ msgstr "Bokförd Fast Tillgång"
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr "Bokföring av Lager Värde på flera Konto gör det svårare att spåra lager och konto värde."
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr "Bokföring är låst till {0}"
@@ -9433,7 +9447,7 @@ msgstr "Kan inte filtrera baserat på Betalning Sätt, om grupperad efter Betaln
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr "Kan inte filtrera baserat på Verifikat nummer om grupperad efter Verifikat"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr "Kan bara skapa betalning mot ofakturerad {0}"
@@ -9619,7 +9633,7 @@ msgstr "Kan inte optimera rutt eftersom Start Adress saknas."
msgid "Cannot Relieve Employee"
msgstr "Kan inte Avlösa Personal"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr "Kan inte godkänna om Register Poster för verifikationer under stängt Bokföringsår."
@@ -9635,6 +9649,10 @@ msgstr "Kan inte tillämpa TDS mot flera parter i en post"
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr "Kan inte vara Fast Tillgång artikel när Lager Register är skapad."
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr "Kan inte avbryta Tillgång Avskrivning Schema {0} eftersom det finns utkast i journal post {1}."
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr "Kan inte annullera Kassa Stängning Post"
@@ -9724,7 +9742,7 @@ msgstr "Kan inte skapa retur för konsoliderad faktura {0}."
msgid "Cannot create root account."
msgstr "Kan inte skapa klass konto."
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
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"
@@ -9741,7 +9759,7 @@ msgstr "Kan inte dra av när kategori angets \"Värdering\" eller \"Värdering o
msgid "Cannot delete Exchange Gain/Loss row"
msgstr "Kan inte ta bort Valutaväxling Resultat rad"
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr "Kan inte ta bort Serie Nummer {0}, eftersom det används i Lager Transaktioner"
@@ -10187,11 +10205,11 @@ msgstr "Chain"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr "Växel Belopp"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr "Ändra Utgivning Datum"
@@ -10204,7 +10222,7 @@ msgstr "Ändra Utgivning Datum"
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr "Förändring i Lager Värde"
@@ -11012,6 +11030,7 @@ msgstr "Bolag"
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11159,6 +11178,7 @@ msgstr "Bolag"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11244,8 +11264,8 @@ msgstr "Bolag"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11561,7 +11581,7 @@ msgstr "Org.Nr."
msgid "Company and Posting Date is mandatory"
msgstr "Bolag och Registrering Datum erfordras"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr "Bolag Valutor för båda Bolag ska matcha för Moder Bolag Transaktioner."
@@ -12842,7 +12862,7 @@ 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12861,7 +12881,7 @@ msgstr "Kostnad"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -13074,7 +13094,7 @@ msgstr "Kunde inte ta bort Demo Data"
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:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
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"
@@ -13197,15 +13217,15 @@ msgstr "Cr"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13447,7 +13467,7 @@ msgstr "Skapa Möjlighet"
msgid "Create POS Opening Entry"
msgstr "Skapa Kassa Öppning Post"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr "Skapa Betalning Post"
@@ -13603,7 +13623,7 @@ msgstr "Skapar Bokföring..."
msgid "Creating Delivery Note ..."
msgstr "Skapar Försäljning Följesedel ..."
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr "Skapar Dimensioner..."
@@ -13623,7 +13643,7 @@ msgstr "Skapar Inköp Ordrar ..."
msgid "Creating Purchase Order ..."
msgstr "Skapar Inköp Order ..."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13660,11 +13680,6 @@ msgstr "Skapar {} av {} {} ..."
msgid "Creation"
msgstr "Skapande"
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr "Dokument Nummer"
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr "Skapande av {1}(s) klar"
@@ -13699,11 +13714,11 @@ msgstr "Skapande av {0} delvis klar.\n"
msgid "Credit"
msgstr "Kredit"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr "Kredit (Transaktion)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr "Kredit ({0})"
@@ -13846,7 +13861,7 @@ 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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr "Kredit Faktura {0} skapad automatiskt"
@@ -14054,7 +14069,7 @@ msgstr "Cup"
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14153,7 +14168,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:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr "Valuta för {0} måste vara {1}"
@@ -14503,6 +14518,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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14530,6 +14546,10 @@ msgstr "Kund / Artikel / Artikel Grupp"
msgid "Customer / Lead Address"
msgstr "Kund / Potentiell Kund Adress"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr "Kund > Kundgrupp > Distrikt"
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14931,7 +14951,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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr "Kund {0} tillhör inte Projekt {1}"
@@ -15283,7 +15303,7 @@ msgstr "Utgivning Datum"
msgid "Date of Joining"
msgstr "Anställning Datum"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr "Transaktion Datum"
@@ -15420,11 +15440,11 @@ msgstr "Hej System Ansvarig,"
msgid "Debit"
msgstr "Debet"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr "Debet (Transaktion)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr "Debet ({0})"
@@ -15498,7 +15518,7 @@ msgstr "Debet Till"
msgid "Debit To is required"
msgstr "Debet till erfordras"
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr "Debet och Kredit är inte lika för {0} # {1}. Differens är {2}."
@@ -16565,7 +16585,7 @@ msgstr "Demo Data Borttagen"
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16640,9 +16660,9 @@ msgstr "Skriv av baserat på dagliga proportioner"
msgid "Depreciate based on shifts"
msgstr "Avskrivning baserat på Skift"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr "Avskriven Belopp"
@@ -16698,6 +16718,14 @@ msgstr "Avskrivning Post"
msgid "Depreciation Entry Posting Status"
msgstr "Avskrivning Post Registrering Status"
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr "Avskrivning Post mot tillgång {0}"
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr "Avskrivning Post mot {0} värt {1}"
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16706,7 +16734,7 @@ msgstr "Avskrivning Post Registrering Status"
msgid "Depreciation Expense Account"
msgstr "Kostnad Avskrivning Konto"
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr "Kostnad Avskrivning Konto ska vara Intäkt eller Kostnad Konto."
@@ -17592,6 +17620,10 @@ msgstr "Rabatt Datum"
msgid "Discount Percentage"
msgstr "Rabatt Procent"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr "Rabattprocent kan tillämpas antingen på prislista eller för alla prislistor."
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr "Rabattprocent under Transaktion"
@@ -17824,7 +17856,7 @@ msgstr "Avsändare Inställningar"
msgid "Disposal Date"
msgstr "Avskrivning Datum"
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr "Avyttringsdatum {0} kan inte infalla före {1} datum {2} för tillgång."
@@ -18104,7 +18136,7 @@ msgstr "Dokument "
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr "Dokument Behandlade vid varje körning. Kö Storlek ska vara mellan 5 och 100"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr "Dokument: {0} har uppskjutna intäkter/kostnader aktiverat för dem. Kan inte posta om."
@@ -19143,7 +19175,7 @@ msgstr "Tom"
msgid "Ems(Pica)"
msgstr "Ems(Pica)"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
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."
@@ -19494,7 +19526,7 @@ msgstr "Ange namn för Åtgärd, till exempel Skärning."
msgid "Enter a name for this Holiday List."
msgstr "Ange namn för denna Helg Lista."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr "Ange belopp som ska lösas in."
@@ -19556,7 +19588,7 @@ msgstr "Ange kvantitet för Artikel som ska produceras från denna Stycklista."
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr "Ange kvantitet som ska produceras. Råmaterial Artiklar hämtas endast när detta är angivet."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr "Ange {0} belopp."
@@ -19576,7 +19608,7 @@ msgid "Entity"
msgstr "Entitet"
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19671,7 +19703,7 @@ msgstr "Fel uppstod vid utvärdering av kriterier formula"
msgid "Error in party matching for Bank Transaction {0}"
msgstr "Fel i parti avstämning för banktransaktion {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr "Fel uppstod vid registrering av avskrivning poster"
@@ -19723,11 +19755,9 @@ msgstr "Uppskattad Tid och Kostnad"
msgid "Evaluation Period"
msgstr "Utvärdering Period"
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
-msgstr "Även fakturor med tillämpa momsavdrag inaktiverad kommer att inkluderas för att kontrollera kumulativ tröskel överträdelse"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
+msgstr "Även om det finns flera Prissättning Regler med högsta prioritet tillämpas följande interna prioriteringar:"
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
@@ -20088,7 +20118,7 @@ msgstr "Förväntad Värde Efter Användning"
msgid "Expense"
msgstr "Kostnader"
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr "Kostnad / Differens Konto ({0}) måste vara \"Resultat\" konto"
@@ -20133,7 +20163,7 @@ msgstr "Kostnad / Differens Konto ({0}) måste vara \"Resultat\" konto"
msgid "Expense Account"
msgstr "Kostnad Konto"
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr "Kostnad Konto saknas"
@@ -20440,7 +20470,7 @@ msgstr "Fel Datum"
msgid "Failure Description"
msgstr "Fel Beskrivning"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr "Fel: {0}"
@@ -21116,6 +21146,10 @@ msgstr "Fast Tillgång Artikel får ej vara Lager Artikel."
msgid "Fixed Asset Register"
msgstr "Fast Tillgång Register"
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr "Anläggning Tillgång Artikel {0} kan inte användas i Stycklistor."
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21246,7 +21280,7 @@ msgstr "För Standard Leverantör (Valfri)"
msgid "For Item"
msgstr "För Artikel"
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr "För Artikel {0} kan inte tas emot mer än {1} i kvantitet mot {2} {3}"
@@ -22138,7 +22172,7 @@ msgstr "Framtida Betalning Referens"
msgid "Future Payments"
msgstr "Framtida Betalningar"
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr "Framtida datum är inte tillåtet"
@@ -22154,7 +22188,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:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr "Bokföring Register Post"
@@ -22420,8 +22454,8 @@ 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:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22780,7 +22814,7 @@ msgstr "Gram/Liter"
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22790,7 +22824,7 @@ msgstr "Gram/Liter"
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22911,8 +22945,8 @@ msgstr "Brutto Resultat %"
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr "Brutto Inköp Belopp"
@@ -23263,7 +23297,7 @@ msgstr "Hektopascal"
msgid "Height (cm)"
msgstr "Höjd (cm)"
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr "Hej,"
@@ -23302,7 +23336,7 @@ msgstr "Hjälp Text"
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr "Hjälper vid fördelning av Budget/ Mål över månader om bolag har säsongsvariationer."
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr "Här är felloggar för ovannämnda misslyckade avskrivning poster: {0}"
@@ -23398,7 +23432,7 @@ msgstr "Spärra"
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr "Spärra Faktura"
@@ -23492,6 +23526,10 @@ msgstr "Timmar"
msgid "Hours Spent"
msgstr "Förbrukade Timmar"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr "Hur tillämpas prissättningsregeln?"
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23832,6 +23870,10 @@ msgstr "Om angiven kommer system att tillåta Användare med denna roll att skap
msgid "If more than one package of the same type (for print)"
msgstr "Om mer än en förpackning av samma typ (för utskrift)"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr "Om flera prissättningsregler fortsätter att gälla uppmanas användarna att ange prioritet manuellt för att lösa konflikt."
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23848,6 +23890,10 @@ msgstr "Om inte kan man Annullera/Godkänna denna post"
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr "Om pris är noll kommer artikel att behandlas som \"Gratis Artikel\""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr "Om vald prissättningsregel är angiven för \"Pris\" kommer den att skriva över Prislista Pris. Prissättning Regel Pris är slutgiltig pris, så ingen ytterligare rabatt ska tillämpas. Därför kommer den i transaktioner som försäljningsorder, inköpsorder etc. att sättas i \"Pris\" fält istället för \"Prislista Pris\" fält."
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23930,6 +23976,10 @@ msgstr "Om vald kan flera material användas för en Arbetsorder. Detta är anv
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr "Om vald uppdateras Stycklista Kostnad automatiskt baserat på Värderingssats / Prislista Pris / Senaste Inköp Pris för Råmaterial."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr "Om två eller flera prissättningsregler hittas baserat på ovanstående villkor tillämpas prioritet. Prioritet är ett tal mellan 0 och 20, medan standardvärdet är noll (tomt). Högre nummer innebär att den kommer att prioriteras om det finns flera prisregler med samma villkor."
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr "Om lojalitet poäng inte ska ha giltig tid, lämna giltighets tid tom eller 0."
@@ -24024,7 +24074,7 @@ msgstr "Ignorera Tom Lager"
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr "Ignorera Valutakurs omvärdering och Resultat Journaler"
@@ -24076,7 +24126,7 @@ msgstr "Ignorera att Prissättning Regel är aktiverad. Det går inte att använ
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr "Ignorera System Skapade Kredit / Debet Fakturor"
@@ -24839,7 +24889,7 @@ msgstr "Inkommande Samtal Inställningar"
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24912,7 +24962,7 @@ msgstr "Felaktig Serie och Parti Paket"
msgid "Incorrect Stock Value Report"
msgstr "Felaktig Lager Värde Rapport"
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr "Felaktig Typ av Transaktion"
@@ -25079,13 +25129,13 @@ msgstr "Infoga Nya Poster"
msgid "Inspected By"
msgstr "Kontrollerad Av"
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr "Kontroll Avvisad"
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr "Kontroll Erfordras"
@@ -25102,7 +25152,7 @@ msgstr "Kontroll Erfordras före Leverans"
msgid "Inspection Required before Purchase"
msgstr "Kontroll Erfordras före Inköp"
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr "Kontroll Godkännande"
@@ -25132,7 +25182,7 @@ msgstr "Installation Avisering"
msgid "Installation Note Item"
msgstr "Installation Avisering Post"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr "Installation Avisering {0} är redan godkänd"
@@ -25190,7 +25240,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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "Otillräcklig Lager"
@@ -25381,7 +25431,7 @@ msgstr "Interna Överföringar"
msgid "Internal Work History"
msgstr "Intern Arbetsliv Erfarenhet"
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr "Interna Överföringar kan endast göras i bolag standard valuta"
@@ -25417,7 +25467,7 @@ msgid "Invalid Account"
msgstr "Ogiltig Konto"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr "Ogiltig Tilldelad Belopp"
@@ -25445,7 +25495,7 @@ msgstr "Ogiltig Avtal Order för vald Kund och Artikel"
msgid "Invalid Child Procedure"
msgstr "Ogiltig Underordnad Procedur"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr "Ogiltig Bolag för Intern Bolag Transaktion"
@@ -25503,7 +25553,7 @@ msgid "Invalid Ledger Entries"
msgstr "Ogiltiga Register Poster"
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr "Ogiltig Öppning Post"
@@ -25531,7 +25581,7 @@ msgstr "Ogiltig Primär Roll"
msgid "Invalid Priority"
msgstr "Ogiltig Prioritet"
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr "Ogiltig Process Förlust Konfiguration"
@@ -25615,8 +25665,8 @@ msgstr "Ogiltig sökfråga"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr "Ogiltigt värde {0} för {1} mot konto {2}"
@@ -25624,7 +25674,7 @@ msgstr "Ogiltigt värde {0} för {1} mot konto {2}"
msgid "Invalid {0}"
msgstr "Ogiltig {0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr "Ogiltig {0} för Intern Bolag Transaktion."
@@ -25834,7 +25884,7 @@ msgstr "Fakturerad Kvantitet"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26886,6 +26936,8 @@ msgstr "Artikel Kundkorg"
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26904,7 +26956,11 @@ msgstr "Artikel Kod"
msgid "Item Code (Final Product)"
msgstr "Artikel Kod (Färdig Artikel)"
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr "Artikelkod > Artikelgrupp > Varumärke"
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr "Artikel Kod kan inte ändras för Serie Nummer"
@@ -27308,6 +27364,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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28228,7 +28285,7 @@ msgstr "Journal Post för Rest Artiklar"
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr "Journal Post Typ ska anges som Avskrivning Post för tillgång avskrivning"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr "Journal Post {0} har inte konto {1} eller är redan avstämd mot andra verifikat"
@@ -28434,7 +28491,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:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29150,7 +29207,7 @@ msgstr "Lokal"
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29821,7 +29878,7 @@ msgstr "Erfodrad Bokföring Dimension"
msgid "Mandatory Depends On"
msgstr "Erfordrad Beroende Av"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr "Erfodrad Fält"
@@ -29911,6 +29968,7 @@ msgstr "Manuell post kan inte skapas! Inaktivera automatisk post för uppskjuten
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30469,6 +30527,7 @@ msgid "Material Requested"
msgstr "Material Begärd"
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr "Material Begäran"
@@ -30824,7 +30883,7 @@ msgstr "Meddelande"
msgid "Message Examples"
msgstr "Meddelande Exempel"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr "Meddelande Skickad"
@@ -31138,8 +31197,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr "Konto Saknas"
@@ -31157,6 +31216,10 @@ 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
+msgid "Missing Filters"
+msgstr "Saknade Filter"
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr "Finans Register Saknas"
@@ -31189,7 +31252,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:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr "Värde Saknas"
@@ -31855,7 +31918,7 @@ msgstr "Naturgas"
msgid "Needs Analysis"
msgstr "Behöver Analys"
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr "Negativ Parti Kvantitet"
@@ -32287,7 +32350,7 @@ msgstr "Nya Försäljning Ordrar"
msgid "New Sales Person Name"
msgstr "Ny Säljare Namn"
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr "Nya Serie Nummer kan inte ha Lager. Lager måste anges av Lager Post eller Inköp Följesedel"
@@ -32323,7 +32386,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:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr "Ny utgivning datum ska vara i framtiden"
@@ -32432,7 +32495,7 @@ msgstr "Ingen Åtgärd"
msgid "No Answer"
msgstr "Ingen Svar"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr "Ingen Kund hittades för Intern Bolag Transaktioner som representerar Bolag {0}"
@@ -32489,9 +32552,9 @@ msgstr "Inga Utestående Fakturor hittades för denna parti"
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr "Ingen Kassa Profil hittad. Skapa ny Kassa Profil"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr "Ingen Behörighet"
@@ -32526,7 +32589,7 @@ msgstr "Ingen Lager Tillgänglig för närvarande"
msgid "No Summary"
msgstr "Ingen Översikt"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr "Ingen Leverantör hittades för Intern Bolag Transaktioner som representerar Bolag {0}"
@@ -32624,7 +32687,7 @@ msgstr "Antal Artiklar i Kundkorg"
msgid "No items to be received are overdue"
msgstr "Inga artiklar som ska tas emot är försenade"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr "Inga avstämningar uppstod via automatisk avstämning"
@@ -32758,11 +32821,11 @@ msgstr "Inga lager transaktioner kan skapas eller ändras före detta datum."
msgid "No values"
msgstr "Inga Värden"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr "Inga {0} konto hittades för detta bolag."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr "Ingen {0} hittades för Intern Bolag Transaktioner."
@@ -32797,7 +32860,7 @@ msgstr "Ej Avskrivningsbar Kategori"
msgid "Non Profit"
msgstr "Förening"
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr "Ej Lager Artiklar"
@@ -32976,7 +33039,7 @@ msgstr "Obs: Förfallodatum överskrider tillåtna {0} kreditdagar med {1} dag(a
msgid "Note: Email will not be sent to disabled users"
msgstr "Obs: E-post kommer inte att skickas till inaktiverade Användare"
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr "Obs: Om du vill använda färdig artikel {0} som råmaterial, markera kryssruta \"Utvidga Inte\" i Artikel Inställningar mot samma råmaterial."
@@ -32996,7 +33059,7 @@ msgstr "Obs: Detta Resultat Enhet är en Grupp. Kan inte skapa bokföring poster
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr "Obs: För att slå samman artiklar skapar separat lager avstämning för gamla artikel {0}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr "Obs: {0}"
@@ -33012,6 +33075,7 @@ msgstr "Obs: {0}"
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33447,6 +33511,12 @@ msgstr "Endast ej Grupp Noder är Tillåtna i Transaktioner"
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr "Endast en {0} post kan skapas mot Arbetsorder {1}"
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr "Endast betalningsposter där \"Tillämpa Moms avdrag\" inte har valts kommer att beaktas vid kontroll av överskridande av kumulativa tröskelvärden"
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33649,8 +33719,8 @@ msgstr "Öppning (Dr)"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr "Öppning Ackumulerad Avskrivning"
@@ -33692,7 +33762,7 @@ msgstr "Öppning Datum"
msgid "Opening Entry"
msgstr "Öppning Post"
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr "Öppning Post kan inte skapas efter att Period Stängning Verifikat är skapad."
@@ -33720,7 +33790,7 @@ msgid "Opening Invoice Item"
msgstr "Öppning Faktura Post"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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."
@@ -33794,7 +33864,7 @@ msgstr "Drift Kostnad (Bolag Valuta)"
msgid "Operating Cost Per BOM Quantity"
msgstr "Drift Kostnad per Stycklista Kvantitet"
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr "Drift Kostnad per Arbetsorder / Styckelista"
@@ -33950,7 +34020,7 @@ msgstr "Åtgärder"
msgid "Operations Routing"
msgstr "Åtgärd Ordning"
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr "Åtgärder kan inte lämnas tomma"
@@ -34542,7 +34612,7 @@ msgstr "Över Leverans/Följesedel Tillåtelse (%)"
msgid "Over Picking Allowance"
msgstr "Över Plock Tillåtelse"
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr "Över Följesedel"
@@ -34994,7 +35064,7 @@ msgstr "Packad Artikel"
msgid "Packed Items"
msgstr "Packade Artiklar"
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr "Packade artiklar kan inte överföras internt"
@@ -35029,7 +35099,7 @@ msgstr "Packsedel"
msgid "Packing Slip Item"
msgstr "Packsedel Artikel"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr "Packsedel Annullerad"
@@ -35115,7 +35185,7 @@ msgstr "Betald"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35390,7 +35460,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:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr "Partiell Lager Reservation"
@@ -35584,9 +35654,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35747,9 +35817,9 @@ 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35914,7 +35984,7 @@ msgstr "Betalning Inställningar"
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -36050,7 +36120,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr "Betalning Post har ändrats efter hämtning.Hämta igen."
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr "Betalning Post är redan skapad"
@@ -36259,7 +36329,7 @@ msgstr "Betalning Referenser"
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36285,11 +36355,11 @@ msgstr "Betalning Begäran Typ"
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr "Betalning Begäran som skapas från Försäljning Order eller Inköp Order kommer att få Utkast status. När inaktiverad kommer dokument att vara i osparat tillstånd."
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr "Betalning Begäran för {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr "Betalning Begäran är redan skapad"
@@ -36447,7 +36517,7 @@ msgstr "Betalning URL"
msgid "Payment Unlink Error"
msgstr "Betalning Bortkoppling Fel"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
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}"
@@ -36768,7 +36838,7 @@ msgstr "Period"
msgid "Period Based On"
msgstr "Period Baserat på"
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr "Period Stängd"
@@ -37371,7 +37441,7 @@ msgstr "Lägg till konto i rot nivå Bolag - {}"
msgid "Please add {1} role to user {0}."
msgstr "Lägg till roll {1} till användare {0}."
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr "Justera kvantitet eller redigera {0} för att fortsätta."
@@ -37379,7 +37449,7 @@ msgstr "Justera kvantitet eller redigera {0} för att fortsätta."
msgid "Please attach CSV file"
msgstr "Bifoga CSV Fil"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr "Annullera och ändra Betalning Post"
@@ -37392,7 +37462,7 @@ msgstr "Annullera Betalning Post manuellt"
msgid "Please cancel related transaction."
msgstr "Annullera relaterad transaktion."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr "Välj Flera Valutor alternativ för att tillåta konto med annan valuta"
@@ -37469,7 +37539,7 @@ msgstr "Skapa Inköp Följesdel eller Inköp Faktura för Artikel {0}"
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr "Ta bort Artikel Paket {0} innan sammanslagning av {1} med {2}"
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr "Inaktivera Arbetsflöde tillfälligt för Journal Post {0}"
@@ -37593,7 +37663,7 @@ msgstr "Ange Inköp Följesedel"
msgid "Please enter Receipt Document"
msgstr "Ange Inköp Följesedel"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr "Ange Referens Datum"
@@ -37718,8 +37788,8 @@ msgstr "Kontrollera att du verkligen vill ta bort alla transaktioner för Bolag.
msgid "Please mention 'Weight UOM' along with Weight."
msgstr "Ange \"Vikt Enhet\" tillsammans med Vikt."
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr "Ange '{0}' i Bolag: {1}"
@@ -37847,7 +37917,7 @@ 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:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr "Välj Prislista"
@@ -37879,7 +37949,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr "Välj Stycklista"
@@ -37969,6 +38039,10 @@ 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
+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
msgid "Please select atleast one item to continue"
msgstr "Välj artikel för att fortsätta"
@@ -37977,7 +38051,7 @@ msgstr "Välj artikel för att fortsätta"
msgid "Please select atleast one operation to create Job Card"
msgstr "Välj minst en åtgärd för att skapa Jobb Kort"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr "Välj Rätt Konto"
@@ -38058,15 +38132,15 @@ msgstr "Välj {0}"
msgid "Please set 'Apply Additional Discount On'"
msgstr "Ange 'Tillämpa Extra Rabatt På'"
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr "Ange 'Tillgång Avskrivning Resultat Enhet' i Bolag {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr "Ange 'Tillgång Avskrivning Resultat Konto' för Bolag {0}"
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr "Ange '{0}' i Bolag: {1}"
@@ -38074,7 +38148,7 @@ msgstr "Ange '{0}' i Bolag: {1}"
msgid "Please set Account"
msgstr "Ange Konto"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr "Ange Växel Belopp Konto "
@@ -38100,7 +38174,7 @@ msgstr "Ange Bokföring Dimension {} i {}"
msgid "Please set Company"
msgstr "Ange Bolag"
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: 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}"
@@ -38118,7 +38192,7 @@ msgstr "Ange Org.Nr. för Kund \"%s\""
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr "Ange Org.Nr. för Offentlig Förvaltning \"%s\""
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr "Ange Fast Tillgång Konto för Tillgång Kategori {0}"
@@ -38181,7 +38255,7 @@ msgstr "Ange Konto i Lager {0}"
msgid "Please set an Address on the Company '%s'"
msgstr "Ange adress för Bolag '%s'"
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr "Ange Kostnad konto i Artikel Inställningar"
@@ -38197,23 +38271,23 @@ msgstr "Ange minst en rad i Moms och Avgifter Tabell"
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr "Ange både Moms och Org. Nr. för {0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr "Ange Standard Kassa eller Bank Konto i Betalning Sätt {0}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr "Ange Standard Kassa eller Bank Konto i Betalning Sätt {}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
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:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr "Ange Standard Valutaväxling Resultat Konto för Bolag {}"
@@ -38317,7 +38391,7 @@ msgstr "Ange {0} till {1}, samma konto som användes i ursprunglig faktura {2}."
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr "Konfigurera och aktivera Kontoplan Grupp med Kontoklass {0} för bolag {1}"
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr "Dela detta e-post meddelande med support så att de kan hitta och åtgärda problem. "
@@ -38330,7 +38404,7 @@ msgid "Please specify Company"
msgstr "Ange Bolag"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr "Ange Bolag att fortsätta"
@@ -38503,6 +38577,7 @@ msgstr "Post Kostnader Konto"
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38537,11 +38612,11 @@ 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38560,6 +38635,7 @@ msgstr "Post Kostnader Konto"
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38569,6 +38645,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_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
@@ -39134,6 +39211,14 @@ msgstr "Prissättning Regel Artikel Kod"
msgid "Pricing Rule Item Group"
msgstr "Prissättning Regel Artikel Grupp"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr "Prissättningsregel väljs först baserat på fältet \"Tillämpa på\", vilket kan vara Artikel, Artikelgrupp eller Varumärke."
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr "Prissättningsregel görs för att skriva över prislista / definiera rabattprocent, baserat på vissa kriterier."
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr "Prissättning Regler {0} är uppdaterad"
@@ -39192,6 +39277,10 @@ msgstr "Prissättning Regler {0} är uppdaterad"
msgid "Pricing Rules"
msgstr "Prissättning Regler"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr "Prissättning Regler filtreras ytterligare baserat på kvantitet."
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39579,7 +39668,7 @@ msgstr "Behandling Beskrivning"
msgid "Process Loss"
msgstr "Process Förlust"
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr "Process Förlust i Procent får inte vara större än 100 "
@@ -40069,7 +40158,7 @@ msgstr "Framsteg(%)"
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40544,7 +40633,7 @@ msgstr "Inköp Analys"
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr "Inköp Datum"
@@ -40700,7 +40789,7 @@ msgstr "Inköp Huvudansvarig"
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40876,9 +40965,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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41759,6 +41848,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/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
@@ -41875,7 +41965,7 @@ msgstr "Kvantitet får inte vara mer än {0}"
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr "Kvantitet av Artikel erhållen efter produktion / ompackning från given kvantitet av Råmaterial"
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr "Kvantitet som erfodras för artikel {0} på rad {1}"
@@ -42724,7 +42814,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:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "Spärr Anledning"
@@ -43160,7 +43250,7 @@ msgstr "Lös in Mot"
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr "Lös in Lojalitet Poäng"
@@ -43292,7 +43382,7 @@ msgstr "Referens Datum"
msgid "Reference"
msgstr "Referens"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr "Referens # {0} daterad {1}"
@@ -43430,7 +43520,7 @@ msgstr "Referens Namn"
msgid "Reference No"
msgstr "Referens Nummer. "
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr "Referens Nummer och Referens Datum erfodras för {0}"
@@ -43438,11 +43528,11 @@ msgstr "Referens Nummer och Referens Datum erfodras för {0}"
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr "Referens Nummer och Referens Datum erfordras för Bank Transaktion"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr "Referens Nummer erfordras om Referens Datum är angiven"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr "Referens Nummer."
@@ -43556,11 +43646,11 @@ msgstr "Referens: {0}, Artikel Nummer: {1} och Kund: {2}"
msgid "References"
msgstr "Referenser"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
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:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr "Referenser till Försäljning Ordrar är ofullständiga"
@@ -43705,8 +43795,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43725,7 +43815,7 @@ msgstr "Avgång Datum"
msgid "Remaining"
msgstr "Återstående"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr "Återstående Belopp"
@@ -43738,7 +43828,7 @@ msgstr "Återstående Saldo"
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr "Anmärkning"
@@ -43787,7 +43877,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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -44099,7 +44189,7 @@ msgstr "Posta om Betalning Register Poster"
msgid "Repost Status"
msgstr "Repost Status"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr "Repost startad i bakgrund"
@@ -44423,7 +44513,7 @@ msgstr "Välj om, om vald kontakt är redigerad efter spara"
msgid "Reseller"
msgstr "Återförsäljare"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr "Skicka om Betalning E-post"
@@ -44892,7 +44982,7 @@ msgstr "Retur"
msgid "Return / Credit Note"
msgstr "Retur / Kredit Faktura"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr "Retur / Debet Faktura"
@@ -45416,12 +45506,12 @@ 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/sales_invoice/sales_invoice.py:1920
+#: 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/sales_invoice/sales_invoice.py:1915
+#: 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"
@@ -45567,7 +45657,7 @@ msgstr "Rad # {0}: Duplikat Post i Referenser {1} {2}"
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr "Rad # {0}: Förväntad Leverans Datum kan inte vara före Inköp Datum"
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr "Rad # {0}: Kostnad Konto inte angiven för Artikel {1}. {2}"
@@ -45591,11 +45681,11 @@ msgstr "Rad #{0}: Färdig Artikel måste vara {1}"
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr "Rad #{0}: Färdig Artikel referens erfordras för Skrot Artikel {1}."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr "Rad # {0}: För {1} kan du välja referens dokument endast om konto krediteras"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr "Rad # {0}: För {1} kan du välja referens dokument endast om konto debiteras"
@@ -45615,7 +45705,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:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
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. "
@@ -45651,7 +45741,7 @@ 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:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
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} "
@@ -45696,15 +45786,15 @@ msgstr "Rad # {0}: Kvantitet måste vara psitivt tal"
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}."
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr "Rad #{0}: Kvalitet Kontroll erfordras för artikel {1}"
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr "Rad #{0}: Kvalitet Kontroll {1} är inte godkänd för artikel: {2}"
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr "Rad #{0}: Kvalitet Kontroll {1} avvisades för artikel {2}"
@@ -45713,7 +45803,7 @@ msgstr "Rad #{0}: Kvalitet Kontroll {1} avvisades för artikel {2}"
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:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
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."
@@ -45810,19 +45900,19 @@ msgstr "Rad # {0}: Status måste vara {1} för Faktura Rabatt {2}"
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
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:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
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:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
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:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
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}."
@@ -45830,8 +45920,8 @@ msgstr "Rad # {0}: Lager är reserverad för artikel {1} i lager {2}."
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
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."
@@ -46012,7 +46102,7 @@ msgstr "Rad # {0}: Artikel {1} hittades inte i tabellen \"Råmaterial Levererad\
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr "Rad # {0}: Godkänd Kvantitet och Avvisad Kvantitet kan inte vara noll samtidigt."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr "Rad # {0}: Konto {1} och Parti Typ {2} har olika konto typer"
@@ -46020,11 +46110,11 @@ msgstr "Rad # {0}: Konto {1} och Parti Typ {2} har olika konto typer"
msgid "Row {0}: Activity Type is mandatory."
msgstr "Rad # {0}: Aktivitet Typ erfordras."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr "Rad # {0}: Förskott mot Kund måste vara Kredit"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr "Rad # {0}: Förskott mot Leverantör måste vara Debet"
@@ -46044,7 +46134,7 @@ msgstr "Rad {0}: Eftersom {1} är aktiverat kan råmaterial inte läggas till {2
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr "Rad # {0}: Stycklista hittades inte för Artikel {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr "Rad # {0}: Både debet och kredit värdena kan inte vara noll"
@@ -46060,7 +46150,7 @@ msgstr "Rad # {0}: Resultat Enhet {1} tillhör inte Bolag {2}"
msgid "Row {0}: Cost center is required for an item {1}"
msgstr "Rad # {0}: Resultat Enhet erfodras för Artikel {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr "Rad # {0}: Kredit Post kan inte länkas till {1}"
@@ -46068,7 +46158,7 @@ msgstr "Rad # {0}: Kredit Post kan inte länkas till {1}"
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr "Rad # {0}: Valuta för Stycklista # {1} ska vara lika med vald valuta {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr "Rad # {0}: Debet Post kan inte länkas till {1}"
@@ -46084,7 +46174,7 @@ msgstr "Rad # {0}: Förfallo Datum i Betalning Villkor Tabell får inte vara fö
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr "Rad # {0}: Antingen Följesedel eller Packad Artikel Referens erfordras"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "Rad # {0}: Valutaväxling Kurs erfordras"
@@ -46118,7 +46208,7 @@ msgstr "Rad # {0}: Från Tid och till Tid erfordras."
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr "Rad # {0}: Från Tid och till Tid av {1} överlappar med {2}"
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr "Rad # {0}: Från Lager erfordras för interna överföringar"
@@ -46130,7 +46220,7 @@ msgstr "Rad # {0}: Från Tid måste vara före till Tid"
msgid "Row {0}: Hours value must be greater than zero."
msgstr "Rad # {0}: Antal Timmar måste vara högre än noll."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr "Rad # {0}: Ogiltig Referens {1}"
@@ -46154,7 +46244,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr "Rad # {0}: Packad Kvantitet måste vara lika med {1} Kvantitet."
@@ -46162,7 +46252,7 @@ msgstr "Rad # {0}: Packad Kvantitet måste vara lika med {1} Kvantitet."
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr "Rad # {0}: Packsedel är redan skapad för Artikel {1}."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr "Rad # {0}: Parti / Konto stämmer inte med {1} / {2} i {3} {4}"
@@ -46174,11 +46264,11 @@ msgstr "Rad # {0}: Parti Typ och Parti erfordras för Intäkt / Skuld Konto {1}"
msgid "Row {0}: Payment Term is mandatory"
msgstr "Rad # {0}: Betalning Villkor Erfodras"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr "Rad # {0}: Betalning mot Försäljning / Inköp Order ska alltid registreras som Förskott"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr "Rad # {0}: Kontrollera \"Är Förskott\" mot Konto {1} om det är förskott post."
@@ -46246,7 +46336,7 @@ msgstr "Rad {0}: Skift kan inte ändras eftersom avskrivning redan är behandlad
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr "Rad # {0}: Underleverantör Artikel erfordras för Råmaterial {1}"
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr "Rad # {0}: Till Lager erfordras för interna överföringar"
@@ -46270,7 +46360,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:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: 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}"
@@ -46291,7 +46381,7 @@ msgstr "Rad # {0}: {1} måste vara högre än 0"
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr "Rad # {0}: {1} {2} kan inte vara samma som {3} (Parti Konto) {4}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr "Rad # {0}: {1} {2} stämmer inte med {3}"
@@ -46685,7 +46775,7 @@ msgstr "Försäljning Faktura skapas inte av {}"
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:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr "Försäljning Faktura {0} är redan godkänd"
@@ -46914,7 +47004,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:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr "Försäljning Order erfordras för Artikel {0}"
@@ -47424,8 +47514,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47698,7 +47788,7 @@ msgstr "Skrot Material Kostnad (Bolag Valuta)"
msgid "Scrap Warehouse"
msgstr "Skrot Lager"
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr "Skrotning datum kan inte vara före inköp datum"
@@ -47771,7 +47861,7 @@ msgstr "Sekreterare"
msgid "Section"
msgstr "Sektion"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr "Sektion Kod"
@@ -48142,7 +48232,7 @@ msgstr "Välj, för att göra kund sökbar med dessa fält"
msgid "Selected POS Opening Entry should be open."
msgstr "Vald Kassa Öppning Post ska vara öppen."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr "Vald Prislista ska ha Inköp och Försäljning Fält vald."
@@ -48326,7 +48416,7 @@ msgstr "Skicka med Bilaga"
msgid "Sender"
msgstr "Avsändare"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr "Skickar"
@@ -48450,7 +48540,9 @@ msgstr "Serie / Parti Nummer"
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48481,7 +48573,9 @@ msgid "Serial No Count"
msgstr "Serie Nummer Antal"
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr "Serie Nummer Register"
@@ -48489,7 +48583,7 @@ msgstr "Serie Nummer Register"
msgid "Serial No Range"
msgstr "Serienummer Intervall"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr "Serienummer Reserverad"
@@ -48529,6 +48623,13 @@ msgstr "Serie Nummer & Parti"
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr "Serie Nummer och Parti Väljare kan inte användas när Använd Serie Nummer / Parti Fält är aktiverad."
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr "Serienummer och Parti Spårbarhet"
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr "Serie Nummer erfordras"
@@ -48558,7 +48659,7 @@ msgstr "Serie Nummer {0} tillhör inte Artikel {1}"
msgid "Serial No {0} does not exist"
msgstr "Serie Nummer {0} finns inte"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr "Serie Nummer {0} finns inte "
@@ -48607,7 +48708,7 @@ msgstr "Serie Nummer. / Parti Nummer."
msgid "Serial Nos and Batches"
msgstr "Serie Nummer & Partier"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr "Serie Nummer skapade"
@@ -48685,11 +48786,11 @@ msgstr "Serie Nummer och Parti "
msgid "Serial and Batch Bundle"
msgstr "Serie och Parti Paket"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr "Serie och Parti Paket skapad"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr "Serie och Parti Paket uppdaterad"
@@ -49123,7 +49224,7 @@ msgstr "Ange Landad Kostnad baserat på Inköp Faktura Pris"
msgid "Set Loyalty Program"
msgstr "Ange Lojalitet Program"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr "Ange ny Frisläppande Datum"
@@ -49378,7 +49479,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:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr "Inställning av {0} erfordras"
@@ -49562,7 +49663,7 @@ msgstr "Leverans Typ"
msgid "Shipment details"
msgstr "Leverans Detaljer"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr "Leveranser"
@@ -49809,6 +49910,10 @@ msgstr "Visa Avbrutna Poster"
msgid "Show Completed"
msgstr "Visa Klar"
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr "Visa Kredit / Debet i Bolag Valuta"
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr "Visa Kumulativ Belopp"
@@ -49924,7 +50029,7 @@ msgstr "Förhandsgranska"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr "Visa Anmärkningar"
@@ -50231,13 +50336,27 @@ msgstr "Från"
msgid "Source DocType"
msgstr "Käll DocType"
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr "Källdokument"
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr "Käll DocType Namn"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr "Källdokument Nummer"
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr "Käll DocType"
@@ -50308,7 +50427,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:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr "Från Lager erfordras för artikel {0}."
@@ -50819,7 +50938,7 @@ msgstr "Stat/Provins"
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51162,7 +51281,7 @@ msgstr "Lager Post {0} skapades"
msgid "Stock Entry {0} has created"
msgstr "Lager Post {0} skapad"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr "Lager Post {0} ej godkänd"
@@ -51385,13 +51504,13 @@ msgstr "Lager Omregistrering Inställningar"
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51400,13 +51519,13 @@ msgstr "Lager Omregistrering Inställningar"
msgid "Stock Reservation"
msgstr "Lager Reservation"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr "Lager Reservation Poster Annullerade"
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr "Lager Reservation Poster Skapade"
@@ -51428,7 +51547,7 @@ msgstr "Lager Reservation Post kan inte uppdateras eftersom den är levererad. "
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:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr "Lager Reservation för Lager stämmer inte"
@@ -51673,7 +51792,7 @@ 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:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr "Lager kan inte reserveras i grupp lager {0}."
@@ -51689,7 +51808,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr "Lager reservation är ångrad för arbetsorder {0}."
@@ -52557,10 +52676,15 @@ 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "Leverantör"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr "Leverantör > Leverantörstyp"
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52673,7 +52797,7 @@ msgstr "Leverantör Faktura"
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr "Leverantör Faktura Datum"
@@ -52687,8 +52811,8 @@ 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "Leverantör Faktura Nummer"
@@ -53236,16 +53360,16 @@ msgstr "System kontrollerar inte överfakturering eftersom belopp för Artikel {
msgid "System will notify to increase or decrease quantity or amount "
msgstr "System meddelar att öka eller minska Kvantitet eller Belopp"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr "TCS Belopp"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr "TCS Sats %"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr "TDS Belopp"
@@ -53262,7 +53386,7 @@ msgstr "TDS Avdragen"
msgid "TDS Payable"
msgstr "TDS Betalbar"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr "TDS Sats %"
@@ -53818,7 +53942,7 @@ msgstr "Moms Typ"
msgid "Tax Withheld Vouchers"
msgstr "Moms Avdrag Verifikat"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr "Moms Avdrag"
@@ -54444,7 +54568,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:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
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."
@@ -54472,7 +54596,7 @@ msgstr "Bokföring Register Poster kommer att annulleras i bakgrunden, det kan t
msgid "The Loyalty Program isn't valid for the selected company"
msgstr "Lojalitet Program är inte giltigt för vald Bolag"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr "Betalning Begäran {0} är redan betald, kan inte behandla betalning två gånger"
@@ -54496,7 +54620,7 @@ msgstr "Säljare är länkad till {0}"
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr "Serie Nummer på rad #{0}: {1} är inte tillgänglig i lager {2}."
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr "Serienummer {0} är reserverad för {1} {2} och får inte användas för någon annan transaktion."
@@ -54518,7 +54642,7 @@ msgstr "Arbetsorder erfordras för Demontering Order"
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr "Konto under Skuld eller Eget Kapital, där Resultat Bokförs"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr "Tilldelad Belopp är högre än utestående belopp för Betalning Begäran {0}"
@@ -54559,7 +54683,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:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr "Fält {0} i rad {1} är inte angiven"
@@ -54575,7 +54699,7 @@ msgstr "Folio nummer stämmer inte"
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr "Följande Artiklar, med Lägg undan regler, kunde inte tillgodoses:"
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr "Följande tillgångar kunde inte bokföra avskrivning poster automatiskt: {0}"
@@ -54836,6 +54960,10 @@ msgstr "{0} {1} stämmer inte med {0} {2} på {3} {4}"
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr "{0} {1} används för att beräkna grund kostnad för färdig artikel {2}."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
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."
@@ -55102,7 +55230,7 @@ msgstr "Detta schema skapades när tillgång {0} återställdes på grund av att
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr "Detta schema skapades när Tillgång {0} återställdes vid annullering av Tillgång Kapitalisering {1}."
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr "Detta schema skapades när Tillgång {0} återställdes."
@@ -55110,7 +55238,7 @@ msgstr "Detta schema skapades när Tillgång {0} återställdes."
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr "Detta schema skapades när Tillgång {0} returnerades via Försäljning Faktura {1}."
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr "Detta schema skapades när Tillgång {0} skrotades."
@@ -55885,6 +56013,10 @@ msgstr "Att inkludera moms på rad {0} i artikel pris, moms i rader {1} måste o
msgid "To merge, following properties must be same for both items"
msgstr "Att slå samman, måste följande egenskaper vara samma för båda artiklar"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr "För att inte tillämpa prissättningsregel i viss transaktion måste alla tillämpliga prissättningsregler inaktiveras."
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr "Att åsidosätta detta, aktivera {0} i bolag {1}"
@@ -55902,7 +56034,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr "Att godkänna faktura utan inköp följesedel ange {0} som {1} i {2}"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr "Att använda annan finans register, inaktivera \"Inkludera Standard Finans Register Tillgångar\""
@@ -56124,7 +56256,7 @@ msgstr "Totala Tilldelningar"
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56286,7 +56418,7 @@ msgstr "Totalt Kredit/Debet Belopp ska vara samma som länkad Journal Post"
msgid "Total Debit"
msgstr "Totalt Debet"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr "Totalt Debet måste vara lika med Totalt Kredit. Differens är {0}"
@@ -56879,6 +57011,10 @@ msgstr "Totalt"
msgid "Traceability"
msgstr "Spårbarhet"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr "Spårbarhet Riktning"
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56919,7 +57055,7 @@ msgstr "Spårning URL"
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -57017,7 +57153,7 @@ msgstr "Transaktion Inställningar"
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr "Transaktion Typ"
@@ -57039,7 +57175,7 @@ msgstr "Transaktion referens nummer {0} daterad {1}"
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57636,7 +57772,11 @@ msgstr "Ofördelad Belopp"
msgid "Unassigned Qty"
msgstr "Ej Tilldelat Kvantitet"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr "Ofakturerade Order"
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr "Släpp Faktura"
@@ -59003,7 +59143,7 @@ msgstr "Leverantör Faktura"
msgid "Vendor Invoices"
msgstr "Leverantör Fakturor"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr "Leverantör Namn"
@@ -59070,7 +59210,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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59261,11 +59401,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59300,7 +59440,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr "Verifikat Undertyp"
@@ -59332,9 +59472,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59353,6 +59493,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_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
@@ -59562,6 +59703,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_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
@@ -59670,7 +59812,7 @@ msgstr "Lager och Referens"
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr "Lager kan inte tas bort eftersom Lager Register post finns för detta Lager."
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr "Lager kan inte ändras för Serie Nummer"
@@ -59683,7 +59825,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:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr "Lager erfodras för Lager Artikel {0}"
@@ -59834,7 +59976,7 @@ msgstr "Varna vid Negativt Lager"
msgid "Warning!"
msgstr "Varning!"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr "Varning: Annan {0} # {1} finns mot lager post {2}"
@@ -60317,6 +60459,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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "Arbetsorder"
@@ -60792,7 +60935,7 @@ msgstr "Du importerar data för Kod Lista:"
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr "Du är inte behörig att uppdatera enligt villkoren i {} Arbetsflöde."
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr "Du är inte behörig att lägga till eller uppdatera poster före {0}"
@@ -60824,7 +60967,7 @@ msgstr "Du kan också ange standard Kapital Arbete Pågår konto i Bolag {}"
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr "Du kan ändra Överordnad Konto till Balans Rapport Konto eller välja annat konto."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr "Du kan inte ange aktuell verifikat i 'Mot Journal Post' kolumn"
@@ -60841,7 +60984,7 @@ msgstr "Du kan bara lösa in maximala {0} poäng i denna följd."
msgid "You can only select one mode of payment as default"
msgstr "Du kan bara välja ett betalning sätt som standard"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr "Du kan lösa in upp till {0}."
@@ -60873,11 +61016,11 @@ msgstr "Du kan inte skapa {0} inom stängd bokföring period {1}"
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr "Du kan inte skapa eller annullera bokföring poster under stängd bokföring period {0}"
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr "Du kan inte skapa/ändra några bokföring poster fram till detta datum."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr "Du kan inte kreditera och debitera samma konto på samma gång"
@@ -60893,7 +61036,7 @@ msgstr "Man kan inte redigera överordnad nod."
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr "Du kan inte aktivera både \"{0}\" och \"{1}\" inställningar."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr "Du kan inte lösa in mer än {0}."
@@ -60925,7 +61068,7 @@ msgstr "Du har inte behörighet att {} artikel i {}."
msgid "You don't have enough Loyalty Points to redeem"
msgstr "Det finns inte tillräckligt med Lojalitet Poäng för att lösa in"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr "Du har inte tillräckligt med poäng för att lösa in"
@@ -61351,7 +61494,7 @@ msgstr "benämning"
msgid "to"
msgstr "till"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr "att ta bort belopp för denna Retur Faktura innan annullering."
@@ -61391,7 +61534,7 @@ msgstr "{0}"
msgid "{0} '{1}' is disabled"
msgstr "{0} {1} är inaktiverad"
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr "{0} {1} inte under Bokföringsår {2}"
@@ -61423,7 +61566,7 @@ msgstr "{0} Kupong som användes är {1}. Tillåten kvantitet är förbrukad"
msgid "{0} Digest"
msgstr "{0} Översikt"
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr "{0} Nummer {1} används redan i {2} {3}"
@@ -61439,7 +61582,7 @@ msgstr "{0} Begäran för {1}"
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr "{0} Behåll Prov är baserad på Parti. välj Har Parti Nummer att behålla prov på Artikel"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr "{0} Transaktion(er) Avstämda"
@@ -61455,19 +61598,19 @@ msgstr "{0} konto är inte av typ {1}"
msgid "{0} account not found while submitting purchase receipt"
msgstr "{0} konto hittades inte när vid godkänande av Inköp Följesedel"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr "{0} mot Faktura {1} daterad {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr "{0} mot Inköp Order {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr "{0} mot Försäljning Faktura {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr "{0} mot Försäljning Order {1}"
@@ -61475,7 +61618,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:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr "{0} och {1}"
@@ -61534,7 +61677,7 @@ msgstr "{0} angiven två gånger under Artikel Moms"
msgid "{0} entered twice {1} in Item Taxes"
msgstr "{0} angiven två gånger {1} under Artikel Moms"
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr "{0} för {1}"
@@ -61587,7 +61730,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr "{0} är erfodrad för Artikel {1}"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr "{0} är erfodrad för konto {1}"
@@ -61662,7 +61805,7 @@ msgstr "{0} artiklar producerade"
msgid "{0} must be negative in return document"
msgstr "{0} måste vara negativ i retur dokument"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr "{0} får inte göra transaktioner med {1}. Ändra fbolag eller lägg till bolag i \"Tillåtet att handla med\" i kundregister."
@@ -61678,7 +61821,7 @@ msgstr "{0} parameter är ogiltig"
msgid "{0} payment entries can not be filtered by {1}"
msgstr "{0} betalning poster kan inte filtreras efter {1}"
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr "{0} kvantitet av artikel {1} tas emot i Lager {2} med kapacitet {3}."
@@ -61739,7 +61882,7 @@ msgstr "{0} {1}"
msgid "{0} {1} Manually"
msgstr "{0} {1} Manuellt"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr "{0} {1} Delvis Avstämd"
@@ -61804,7 +61947,7 @@ msgstr "{0} {1} är annullerad eller stoppad"
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr "{0} {1} är annullerad så åtgärd kan inte slutföras"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr "{0} {1} är stängd"
@@ -61816,7 +61959,7 @@ msgstr "{0} {1} är inaktiverad"
msgid "{0} {1} is frozen"
msgstr "{0} {1} är låst"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr "{0} {1} är fullt fakturerad"
@@ -61828,12 +61971,12 @@ msgstr "{0} {1} är inte aktiv"
msgid "{0} {1} is not associated with {2} {3}"
msgstr "{0} {1} är inte associerad med {2} {3}"
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr "{0} {1} är inte under något aktivt Bokföringsår"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr "{0} {1} ej godkänd"
@@ -61845,7 +61988,7 @@ msgstr "{0} {1} är parkerad"
msgid "{0} {1} must be submitted"
msgstr "{0} {1} måste godkännas"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr "{0} {1} får inte registreras om. Ändra {2} för att aktivera omregistrering."
@@ -61880,7 +62023,7 @@ msgstr "{0} {1}: Konto {2} är inaktiv"
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr "{0} {1}: Bokföring Post för {2} kan endast skapas i valuta: {3}"
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr "{0} {1}: Resultat Enhet erfordras för Artikel {2}"
@@ -61958,7 +62101,7 @@ msgstr "{doctype} {name} är annullerad eller stängd."
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr "{field_label} erfordras för underleverantör {doctype}."
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr "{item_name} Prov Kvantitet ({sample_size}) kan inte vara högre än accepterad kvantitete ({accepted_quantity})"
@@ -61966,7 +62109,7 @@ msgstr "{item_name} Prov Kvantitet ({sample_size}) kan inte vara högre än acce
msgid "{ref_doctype} {ref_name} is {status}."
msgstr "{ref_doctype} {ref_name} är {status}."
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr "{}"
@@ -62024,7 +62167,7 @@ msgstr "{}Pågående"
msgid "{} To Bill"
msgstr "{} Att Fakturera"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr "{} kan inte annulleras eftersom intjänade Lojalitet Poäng har lösts in. Först annullera {} Nummer {}"
diff --git a/erpnext/locale/th.po b/erpnext/locale/th.po
index a4218e367cd..badaa1c274b 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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:10\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:06\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Thai\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr " รายการสินค้า"
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr "จำนวนวันตั้งแต่คำสั่งซื้
msgid "'Default {0} Account' in Company {1}"
msgstr "บัญชี {0} เริ่มต้น ในบริษัท {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr "รายการ ไม่สามารถว่างเปล่าได้"
@@ -840,11 +840,11 @@ msgstr ""
msgid "Your Shortcuts"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr ""
@@ -1215,10 +1215,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1523,7 +1523,7 @@ msgstr ""
msgid "Account {0}: You can not assign itself as parent account"
msgstr ""
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr ""
@@ -2012,7 +2012,7 @@ msgstr ""
msgid "Accounts Manager"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr ""
@@ -2199,7 +2199,7 @@ msgstr "การตั้งค่าบัญชี"
msgid "Accounts User"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr ""
@@ -2559,6 +2559,10 @@ msgstr ""
msgid "Actual Expense"
msgstr ""
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr ""
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2696,7 +2700,7 @@ msgstr ""
msgid "Add Child"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr ""
@@ -3502,7 +3506,7 @@ msgstr ""
msgid "Advance amount cannot be greater than {0} {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr ""
@@ -3559,7 +3563,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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr ""
@@ -3628,7 +3632,7 @@ msgstr ""
msgid "Against Income Account"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr ""
@@ -3676,7 +3680,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr ""
@@ -3688,7 +3692,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr ""
@@ -3700,8 +3704,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr ""
@@ -3827,7 +3831,7 @@ msgstr ""
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr "ทุกบัญชี"
@@ -3995,7 +3999,7 @@ msgstr ""
msgid "All items have already been Invoiced/Returned"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr ""
@@ -4021,7 +4025,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:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr ""
@@ -4907,7 +4911,7 @@ msgstr ""
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5047,7 +5051,7 @@ msgstr ""
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr ""
@@ -5198,7 +5202,7 @@ msgstr ""
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr ""
@@ -5781,7 +5785,7 @@ msgstr "รายการสต็อกที่เพิ่มมูลค่
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5823,7 +5827,7 @@ msgstr "ตารางค่าเสื่อมราคาสินทรั
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr "ตารางค่าเสื่อมราคาสินทรัพย์สำหรับสินทรัพย์ {0} และสมุดการเงิน {1} ไม่ได้ใช้ค่าเสื่อมราคาตามกะ"
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr "ไม่พบตารางค่าเสื่อมราคาสินทรัพย์สำหรับสินทรัพย์ {0} และสมุดการเงิน {1}"
@@ -5862,7 +5866,7 @@ msgstr "การจำหน่ายสินทรัพย์"
msgid "Asset Finance Book"
msgstr "สมุดการเงินสินทรัพย์"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr "รหัสสินทรัพย์"
@@ -5938,7 +5942,7 @@ msgstr "สร้างบันทึกการเคลื่อนย้า
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr "ชื่อสินทรัพย์"
@@ -6024,9 +6028,9 @@ msgstr "สถานะสินทรัพย์"
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr "มูลค่าสินทรัพย์"
@@ -6055,7 +6059,7 @@ msgstr "สินทรัพย์ถูกยกเลิก"
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "ไม่สามารถยกเลิกสินทรัพย์ได้ เนื่องจากมันอยู่ในสถานะ {0} แล้ว"
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr "ไม่สามารถทิ้งสินทรัพย์ได้ก่อนการบันทึกค่าเสื่อมราคาครั้งสุดท้าย"
@@ -6087,7 +6091,7 @@ msgstr "สินทรัพย์ไม่สามารถใช้งาน
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr "สินทรัพย์ได้รับที่ตำแหน่ง {0} และออกให้พนักงาน {1}"
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr "สินทรัพย์ถูกกู้คืน"
@@ -6099,11 +6103,11 @@ msgstr "สินทรัพย์ถูกกู้คืนหลังจา
msgid "Asset returned"
msgstr "สินทรัพย์ถูกคืน"
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr "สินทรัพย์ถูกทิ้ง"
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr "สินทรัพย์ถูกทิ้งผ่านรายการบัญชี {0}"
@@ -6128,7 +6132,7 @@ msgstr "สินทรัพย์ถูกอัปเดตหลังจา
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr "สินทรัพย์ถูกอัปเดตเนื่องจากการซ่อมแซมสินทรัพย์ {0} {1}"
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr "สินทรัพย์ {0} ไม่สามารถทิ้งได้ เนื่องจากมันอยู่ในสถานะ {1} แล้ว"
@@ -6161,7 +6165,15 @@ msgstr "สินทรัพย์ {0} ถูกอัปเดตแล้ว
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr ""
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr "สินทรัพย์ {0} ต้องถูกส่ง"
@@ -6542,7 +6554,7 @@ msgstr ""
msgid "Auto Reconcile Payments"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr ""
@@ -6552,7 +6564,7 @@ msgstr ""
msgid "Auto Reconciliation Job Trigger"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr ""
@@ -6727,7 +6739,7 @@ msgstr ""
msgid "Available Batch Report"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr ""
@@ -6956,7 +6968,7 @@ msgstr ""
msgid "BOM 1"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "BOM 1 {0} และ BOM 2 {1} ไม่ควรเหมือนกัน"
@@ -7194,23 +7206,23 @@ msgstr "BOM ไม่มีรายการสต็อกใด ๆ"
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr "การวนซ้ำ BOM: {0} ไม่สามารถเป็นลูกของ {1} ได้"
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr "การวนซ้ำ BOM: {1} ไม่สามารถเป็นพ่อแม่หรือลูกของ {0} ได้"
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr "BOM {0} ไม่ได้เป็นของรายการ {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr "BOM {0} ต้องเปิดใช้งาน"
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr "BOM {0} ต้องถูกส่ง"
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr "ไม่พบ BOM {0} สำหรับรายการ {1}"
@@ -7281,7 +7293,7 @@ msgstr ""
msgid "Balance (Dr - Cr)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr ""
@@ -7760,7 +7772,7 @@ msgstr ""
msgid "Base Tax Withholding Net Total"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr ""
@@ -7965,7 +7977,9 @@ msgstr ""
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -7976,7 +7990,7 @@ msgstr ""
msgid "Batch No is mandatory"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr ""
@@ -7999,7 +8013,7 @@ msgstr ""
msgid "Batch Nos"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr ""
@@ -8012,7 +8026,7 @@ msgstr ""
msgid "Batch Number Series"
msgstr ""
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr ""
@@ -8125,7 +8139,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8438,8 +8452,8 @@ msgstr ""
msgid "Blanket Order Rate"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr ""
@@ -8555,7 +8569,7 @@ msgstr ""
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr ""
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr ""
@@ -9329,7 +9343,7 @@ msgstr ""
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr ""
@@ -9515,7 +9529,7 @@ msgstr ""
msgid "Cannot Relieve Employee"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr ""
@@ -9531,6 +9545,10 @@ msgstr ""
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr ""
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr ""
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr ""
@@ -9620,7 +9638,7 @@ msgstr ""
msgid "Cannot create root account."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr ""
@@ -9637,7 +9655,7 @@ msgstr ""
msgid "Cannot delete Exchange Gain/Loss row"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr ""
@@ -10083,11 +10101,11 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr ""
@@ -10100,7 +10118,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr ""
@@ -10908,6 +10926,7 @@ msgstr ""
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11055,6 +11074,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11140,8 +11160,8 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11457,7 +11477,7 @@ msgstr ""
msgid "Company and Posting Date is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr ""
@@ -12738,7 +12758,7 @@ 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12757,7 +12777,7 @@ msgstr "ต้นทุน"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -12970,7 +12990,7 @@ msgstr ""
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr ""
@@ -13093,15 +13113,15 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13343,7 +13363,7 @@ msgstr ""
msgid "Create POS Opening Entry"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr ""
@@ -13499,7 +13519,7 @@ msgstr "กำลังสร้างบัญชี..."
msgid "Creating Delivery Note ..."
msgstr ""
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr ""
@@ -13519,7 +13539,7 @@ msgstr ""
msgid "Creating Purchase Order ..."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13556,11 +13576,6 @@ msgstr ""
msgid "Creation"
msgstr ""
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr ""
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr ""
@@ -13593,11 +13608,11 @@ msgstr ""
msgid "Credit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr ""
@@ -13740,7 +13755,7 @@ 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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr ""
@@ -13948,7 +13963,7 @@ msgstr ""
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14047,7 +14062,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr ""
@@ -14397,6 +14412,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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14424,6 +14440,10 @@ msgstr "ลูกค้า / รายการ / กลุ่มรายกา
msgid "Customer / Lead Address"
msgstr "ที่อยู่ลูกค้า / ผู้ติดต่อ"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr ""
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14825,7 +14845,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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr "ลูกค้า {0} ไม่ได้เป็นของโครงการ {1}"
@@ -15177,7 +15197,7 @@ msgstr "วันที่ออก"
msgid "Date of Joining"
msgstr "วันที่เข้าร่วม"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr "วันที่ทำธุรกรรม"
@@ -15314,11 +15334,11 @@ msgstr "เรียน ผู้จัดการระบบ,"
msgid "Debit"
msgstr "เดบิต"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr "เดบิต (ธุรกรรม)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr "เดบิต ({0})"
@@ -15392,7 +15412,7 @@ msgstr "เดบิตไปยัง"
msgid "Debit To is required"
msgstr "ต้องระบุเดบิตไปยัง"
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr "เดบิตและเครดิตไม่เท่ากันสำหรับ {0} #{1}. ความแตกต่างคือ {2}."
@@ -16459,7 +16479,7 @@ msgstr ""
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16534,9 +16554,9 @@ msgstr ""
msgid "Depreciate based on shifts"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr ""
@@ -16592,6 +16612,14 @@ msgstr ""
msgid "Depreciation Entry Posting Status"
msgstr ""
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr ""
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16600,7 +16628,7 @@ msgstr ""
msgid "Depreciation Expense Account"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr ""
@@ -17486,6 +17514,10 @@ msgstr ""
msgid "Discount Percentage"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr ""
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr ""
@@ -17718,7 +17750,7 @@ msgstr ""
msgid "Disposal Date"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr ""
@@ -17998,7 +18030,7 @@ msgstr "เอกสาร"
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr "เอกสารถูกประมวลผลในแต่ละทริกเกอร์ ขนาดคิวควรอยู่ระหว่าง 5 ถึง 100"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr "เอกสาร: {0} มีการเปิดใช้งานรายได้/ค่าใช้จ่ายรอตัดบัญชี ไม่สามารถโพสต์ใหม่ได้"
@@ -19037,7 +19069,7 @@ msgstr "ว่างเปล่า"
msgid "Ems(Pica)"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr "เปิดใช้งานอนุญาตการจองบางส่วนในการตั้งค่าสต็อกเพื่อจองสต็อกบางส่วน"
@@ -19388,7 +19420,7 @@ msgstr "ป้อนชื่อสำหรับการดำเนินก
msgid "Enter a name for this Holiday List."
msgstr "ป้อนชื่อสำหรับรายการวันหยุดนี้"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr "ป้อนจำนวนเงินที่จะแลก"
@@ -19449,7 +19481,7 @@ msgstr "ป้อนปริมาณของสินค้าที่จะ
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr "ป้อนปริมาณที่จะผลิต รายการวัตถุดิบจะถูกดึงมาเฉพาะเมื่อมีการตั้งค่านี้"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr "ป้อนจำนวนเงิน {0}"
@@ -19469,7 +19501,7 @@ msgid "Entity"
msgstr "เอนทิตี"
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19564,7 +19596,7 @@ msgstr "ข้อผิดพลาดในการประเมินสู
msgid "Error in party matching for Bank Transaction {0}"
msgstr "ข้อผิดพลาดในการจับคู่ฝ่ายสำหรับธุรกรรมธนาคาร {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr "ข้อผิดพลาดขณะโพสต์รายการค่าเสื่อมราคา"
@@ -19614,11 +19646,9 @@ msgstr "เวลาและต้นทุนโดยประมาณ"
msgid "Evaluation Period"
msgstr "ช่วงการประเมิน"
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
-msgstr "แม้ว่าใบแจ้งหนี้ที่ไม่ได้เลือกใช้การหักภาษี ณ ที่จ่ายจะถูกพิจารณาเพื่อตรวจสอบการละเมิดเกณฑ์สะสม"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
+msgstr ""
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
@@ -19979,7 +20009,7 @@ msgstr "มูลค่าที่คาดหวังหลังจากอ
msgid "Expense"
msgstr "ค่าใช้จ่าย"
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr "บัญชีค่าใช้จ่าย/ความแตกต่าง ({0}) ต้องเป็นบัญชี 'กำไรหรือขาดทุน'"
@@ -20024,7 +20054,7 @@ msgstr "บัญชีค่าใช้จ่าย/ความแตกต
msgid "Expense Account"
msgstr "บัญชีค่าใช้จ่าย"
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr "บัญชีค่าใช้จ่ายหายไป"
@@ -20331,7 +20361,7 @@ msgstr "วันที่ล้มเหลว"
msgid "Failure Description"
msgstr "คำอธิบายความล้มเหลว"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr "ความล้มเหลว: {0}"
@@ -21007,6 +21037,10 @@ msgstr "รายการสินทรัพย์ถาวรต้องเ
msgid "Fixed Asset Register"
msgstr "ทะเบียนสินทรัพย์ถาวร"
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21137,7 +21171,7 @@ msgstr ""
msgid "For Item"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr ""
@@ -22029,7 +22063,7 @@ msgstr "อ้างอิงการชำระเงินในอนาค
msgid "Future Payments"
msgstr "การชำระเงินในอนาคต"
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr "ไม่อนุญาตให้ใช้วันที่ในอนาคต"
@@ -22045,7 +22079,7 @@ msgstr ""
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr ""
@@ -22311,8 +22345,8 @@ msgid "Get Items"
msgstr ""
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22671,7 +22705,7 @@ msgstr ""
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22681,7 +22715,7 @@ msgstr ""
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22802,8 +22836,8 @@ msgstr "เปอร์เซ็นต์กำไรขั้นต้น"
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr "จำนวนเงินซื้อรวม"
@@ -23154,7 +23188,7 @@ msgstr ""
msgid "Height (cm)"
msgstr "ความสูง (ซม.)"
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr "สวัสดี,"
@@ -23193,7 +23227,7 @@ msgstr "ข้อความช่วยเหลือ"
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr "ช่วยให้คุณกระจายงบประมาณ/เป้าหมายในแต่ละเดือนหากธุรกิจของคุณมีฤดูกาล"
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr "นี่คือบันทึกข้อผิดพลาดสำหรับรายการค่าเสื่อมราคาที่ล้มเหลวที่กล่าวถึงข้างต้น: {0}"
@@ -23289,7 +23323,7 @@ msgstr "ระงับ"
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr "ระงับใบแจ้งหนี้"
@@ -23383,6 +23417,10 @@ msgstr "ชั่วโมง"
msgid "Hours Spent"
msgstr "ชั่วโมงที่ใช้ไป"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr ""
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23719,6 +23757,10 @@ msgstr "หากระบุไว้ ระบบจะอนุญาตเ
msgid "If more than one package of the same type (for print)"
msgstr "หากมีมากกว่าหนึ่งแพ็คเกจของประเภทเดียวกัน (สำหรับการพิมพ์)"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr ""
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23735,6 +23777,10 @@ msgstr "หากไม่ใช่ คุณสามารถยกเลิ
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr ""
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23817,6 +23863,10 @@ msgstr "หากเลือกไว้ สามารถใช้วัส
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr "หากเลือกไว้ ต้นทุน BOM จะถูกอัปเดตโดยอัตโนมัติตามอัตราการประเมินมูลค่า / อัตรารายการราคา / อัตราการซื้อครั้งสุดท้ายของวัตถุดิบ"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr "หากคะแนนสะสมไม่มีวันหมดอายุ ให้เว้นระยะเวลาหมดอายุว่างเปล่าหรือเป็น 0"
@@ -23911,7 +23961,7 @@ msgstr "ละเว้นสต็อกว่างเปล่า"
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -23963,7 +24013,7 @@ msgstr "เปิดใช้งานการละเว้นกฎการ
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr "ละเว้นใบเครดิต/เดบิตที่สร้างโดยระบบ"
@@ -24726,7 +24776,7 @@ msgstr "การตั้งค่าสายเรียกเข้า"
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24799,7 +24849,7 @@ msgstr "ชุดหมายเลขซีเรียลและแบทช
msgid "Incorrect Stock Value Report"
msgstr "รายงานมูลค่าสต็อกไม่ถูกต้อง"
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr "ประเภทธุรกรรมไม่ถูกต้อง"
@@ -24966,13 +25016,13 @@ msgstr "แทรกบันทึกใหม่"
msgid "Inspected By"
msgstr "ตรวจสอบโดย"
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr "การตรวจสอบถูกปฏิเสธ"
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr "ต้องการการตรวจสอบ"
@@ -24989,7 +25039,7 @@ msgstr "ต้องการการตรวจสอบก่อนการ
msgid "Inspection Required before Purchase"
msgstr "ต้องการการตรวจสอบก่อนการซื้อ"
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr "การส่งการตรวจสอบ"
@@ -25019,7 +25069,7 @@ msgstr "บันทึกการติดตั้ง"
msgid "Installation Note Item"
msgstr "รายการบันทึกการติดตั้ง"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr "บันทึกการติดตั้ง {0} ได้ถูกส่งแล้ว"
@@ -25077,7 +25127,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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "สต็อกไม่เพียงพอ"
@@ -25268,7 +25318,7 @@ msgstr "การโอนภายใน"
msgid "Internal Work History"
msgstr "ประวัติการทำงานภายใน"
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr "การโอนภายในสามารถทำได้เฉพาะในสกุลเงินเริ่มต้นของบริษัทเท่านั้น"
@@ -25304,7 +25354,7 @@ msgid "Invalid Account"
msgstr "บัญชีไม่ถูกต้อง"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr "จำนวนเงินที่จัดสรรไม่ถูกต้อง"
@@ -25332,7 +25382,7 @@ msgstr "คำสั่งซื้อแบบครอบคลุมไม่
msgid "Invalid Child Procedure"
msgstr "กระบวนการย่อยไม่ถูกต้อง"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr "บริษัทไม่ถูกต้องสำหรับธุรกรรมระหว่างบริษัท"
@@ -25390,7 +25440,7 @@ msgid "Invalid Ledger Entries"
msgstr "รายการบัญชีแยกประเภทไม่ถูกต้อง"
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr "รายการเปิดไม่ถูกต้อง"
@@ -25418,7 +25468,7 @@ msgstr "บทบาทหลักไม่ถูกต้อง"
msgid "Invalid Priority"
msgstr "ลำดับความสำคัญไม่ถูกต้อง"
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr "การกำหนดค่าการสูญเสียกระบวนการไม่ถูกต้อง"
@@ -25502,8 +25552,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr "ค่า {0} ไม่ถูกต้องสำหรับ {1} กับบัญชี {2}"
@@ -25511,7 +25561,7 @@ msgstr "ค่า {0} ไม่ถูกต้องสำหรับ {1} ก
msgid "Invalid {0}"
msgstr "{0} ไม่ถูกต้อง"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr "{0} ไม่ถูกต้องสำหรับธุรกรรมระหว่างบริษัท"
@@ -25721,7 +25771,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26773,6 +26823,8 @@ msgstr "ตะกร้ารายการ"
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26791,7 +26843,11 @@ msgstr "รหัสรายการ"
msgid "Item Code (Final Product)"
msgstr "รหัสรายการ (ผลิตภัณฑ์สุดท้าย)"
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr ""
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr "ไม่สามารถเปลี่ยนรหัสรายการสำหรับหมายเลขซีเรียลได้"
@@ -27195,6 +27251,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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28115,7 +28172,7 @@ msgstr ""
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr ""
@@ -28321,7 +28378,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29037,7 +29094,7 @@ msgstr ""
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29708,7 +29765,7 @@ msgstr "มิติการบัญชีที่จำเป็น"
msgid "Mandatory Depends On"
msgstr "ขึ้นอยู่กับที่จำเป็น"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr "ฟิลด์ที่จำเป็น"
@@ -29798,6 +29855,7 @@ msgstr "ไม่สามารถสร้างรายการด้วย
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30356,6 +30414,7 @@ msgid "Material Requested"
msgstr ""
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr ""
@@ -30711,7 +30770,7 @@ msgstr "ข้อความ"
msgid "Message Examples"
msgstr "ตัวอย่างข้อความ"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr "ส่งข้อความแล้ว"
@@ -31025,8 +31084,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr "บัญชีที่หายไป"
@@ -31044,6 +31103,10 @@ msgstr "ศูนย์ต้นทุนที่หายไป"
msgid "Missing Default in Company"
msgstr "ค่าเริ่มต้นที่หายไปในบริษัท"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr ""
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr "สมุดการเงินที่หายไป"
@@ -31076,7 +31139,7 @@ msgstr "ค่าที่จำเป็นหายไป"
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr "ไม่มีแม่แบบอีเมลสำหรับการจัดส่ง โปรดตั้งค่าในการตั้งค่าการจัดส่ง"
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr "ค่าที่หายไป"
@@ -31742,7 +31805,7 @@ msgstr "ก๊าซธรรมชาติ"
msgid "Needs Analysis"
msgstr "การวิเคราะห์ความต้องการ"
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr "ปริมาณแบทช์ติดลบ"
@@ -32174,7 +32237,7 @@ msgstr "ใบสั่งขายใหม่"
msgid "New Sales Person Name"
msgstr "ชื่อพนักงานขายใหม่"
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr "หมายเลขซีเรียลใหม่ไม่สามารถมีคลังสินค้าได้ คลังสินค้าต้องตั้งค่าโดยการบันทึกสต็อกหรือใบรับซื้อ"
@@ -32210,7 +32273,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:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr "วันที่เผยแพร่ใหม่ควรอยู่ในอนาคต"
@@ -32319,7 +32382,7 @@ msgstr ""
msgid "No Answer"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr ""
@@ -32376,9 +32439,9 @@ msgstr ""
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr ""
@@ -32413,7 +32476,7 @@ msgstr ""
msgid "No Summary"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr ""
@@ -32511,7 +32574,7 @@ msgstr "ไม่มีรายการในรถเข็น"
msgid "No items to be received are overdue"
msgstr "ไม่มีรายการที่จะได้รับที่เกินกำหนด"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr "ไม่มีการจับคู่ที่เกิดขึ้นผ่านการกระทบยอดอัตโนมัติ"
@@ -32645,11 +32708,11 @@ msgstr "ไม่สามารถสร้างหรือแก้ไขธ
msgid "No values"
msgstr "ไม่มีค่า"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr "ไม่พบบัญชี {0} สำหรับบริษัทนี้"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr "ไม่พบ {0} สำหรับธุรกรรมระหว่างบริษัท"
@@ -32684,7 +32747,7 @@ msgstr "หมวดหมู่ที่ไม่สามารถหักค
msgid "Non Profit"
msgstr "ไม่แสวงหากำไร"
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr "รายการที่ไม่ใช่สต็อก"
@@ -32863,7 +32926,7 @@ msgstr "หมายเหตุ: วันที่ครบกำหนดเ
msgid "Note: Email will not be sent to disabled users"
msgstr "หมายเหตุ: จะไม่ส่งอีเมลไปยังผู้ใช้ที่ถูกปิดใช้งาน"
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr "หมายเหตุ: หากคุณต้องการใช้สินค้าสำเร็จรูป {0} เป็นวัตถุดิบ ให้เปิดใช้งานช่องทำเครื่องหมาย 'Do Not Explode' ในตารางรายการสำหรับวัตถุดิบเดียวกัน"
@@ -32883,7 +32946,7 @@ msgstr "หมายเหตุ: ศูนย์ต้นทุนนี้เ
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr "หมายเหตุ: เพื่อรวมรายการ ให้สร้างการกระทบยอดสต็อกแยกต่างหากสำหรับรายการเก่า {0}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr "หมายเหตุ: {0}"
@@ -32899,6 +32962,7 @@ msgstr "หมายเหตุ: {0}"
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33334,6 +33398,12 @@ msgstr "อนุญาตเฉพาะโหนดใบในธุรกร
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr "สามารถสร้างรายการ {0} ได้เพียงรายการเดียวต่อคำสั่งงาน {1}"
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr ""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33535,8 +33605,8 @@ msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr ""
@@ -33578,7 +33648,7 @@ msgstr ""
msgid "Opening Entry"
msgstr ""
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr ""
@@ -33606,7 +33676,7 @@ msgid "Opening Invoice Item"
msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 ""
@@ -33680,7 +33750,7 @@ msgstr ""
msgid "Operating Cost Per BOM Quantity"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr ""
@@ -33836,7 +33906,7 @@ msgstr "การดำเนินการ"
msgid "Operations Routing"
msgstr "การกำหนดเส้นทางการดำเนินการ"
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr "การดำเนินการไม่สามารถเว้นว่างได้"
@@ -34428,7 +34498,7 @@ msgstr ""
msgid "Over Picking Allowance"
msgstr "ค่าเผื่อการหยิบเกิน"
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr "การรับเกิน"
@@ -34880,7 +34950,7 @@ msgstr "รายการที่บรรจุแล้ว"
msgid "Packed Items"
msgstr "รายการที่บรรจุแล้ว"
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr "รายการที่บรรจุแล้วไม่สามารถโอนภายในได้"
@@ -34915,7 +34985,7 @@ msgstr "ใบบรรจุ"
msgid "Packing Slip Item"
msgstr "รายการใบบรรจุ"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr "ใบบรรจุถูกยกเลิก"
@@ -35001,7 +35071,7 @@ msgstr "ชำระแล้ว"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35276,7 +35346,7 @@ msgstr "โอนวัสดุบางส่วน"
msgid "Partial Payment in POS Transactions are not allowed."
msgstr "ไม่อนุญาตให้ชำระเงินบางส่วนในธุรกรรม POS"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr "การจองสต็อกบางส่วน"
@@ -35470,9 +35540,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35633,9 +35703,9 @@ 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35800,7 +35870,7 @@ msgstr "การตั้งค่าผู้จ่าย"
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -35936,7 +36006,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr "รายการชำระเงินถูกแก้ไขหลังจากที่คุณดึง โปรดดึงอีกครั้ง"
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr "สร้างรายการชำระเงินแล้ว"
@@ -36145,7 +36215,7 @@ msgstr "การอ้างอิงการชำระเงิน"
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36171,11 +36241,11 @@ msgstr "ประเภทคำขอการชำระเงิน"
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr "คำขอการชำระเงินที่สร้างจากคำสั่งขายหรือคำสั่งซื้อจะอยู่ในสถานะร่าง เมื่อปิดใช้งานเอกสารจะอยู่ในสถานะที่ยังไม่ได้บันทึก"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr "คำขอการชำระเงินสำหรับ {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr "สร้างคำขอการชำระเงินแล้ว"
@@ -36333,7 +36403,7 @@ msgstr "URL การชำระเงิน"
msgid "Payment Unlink Error"
msgstr "ข้อผิดพลาดในการยกเลิกการเชื่อมโยงการชำระเงิน"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr "การชำระเงินกับ {0} {1} ไม่สามารถมากกว่ายอดค้างชำระ {2}"
@@ -36654,7 +36724,7 @@ msgstr ""
msgid "Period Based On"
msgstr ""
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr ""
@@ -37257,7 +37327,7 @@ msgstr "โปรดเพิ่มบัญชีไปยังบริษั
msgid "Please add {1} role to user {0}."
msgstr "โปรดเพิ่มบทบาท {1} ให้กับผู้ใช้ {0}"
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr "โปรดปรับปริมาณหรือแก้ไข {0} เพื่อดำเนินการต่อ"
@@ -37265,7 +37335,7 @@ msgstr "โปรดปรับปริมาณหรือแก้ไข {0
msgid "Please attach CSV file"
msgstr "โปรดแนบไฟล์ CSV"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr "โปรดยกเลิกและแก้ไขรายการชำระเงิน"
@@ -37278,7 +37348,7 @@ msgstr "โปรดยกเลิกรายการชำระเงิน
msgid "Please cancel related transaction."
msgstr "โปรดยกเลิกธุรกรรมที่เกี่ยวข้อง"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr "โปรดตรวจสอบตัวเลือกหลายสกุลเงินเพื่ออนุญาตบัญชีที่มีสกุลเงินอื่น"
@@ -37355,7 +37425,7 @@ msgstr "โปรดสร้างใบรับซื้อหรือใบ
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr "โปรดลบชุดผลิตภัณฑ์ {0} ก่อนรวม {1} เข้ากับ {2}"
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr "โปรดปิดใช้งานเวิร์กโฟลว์ชั่วคราวสำหรับรายการบัญชี {0}"
@@ -37479,7 +37549,7 @@ msgstr "โปรดป้อนใบรับซื้อก่อน"
msgid "Please enter Receipt Document"
msgstr "โปรดป้อนเอกสารใบเสร็จ"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr "โปรดป้อนวันที่อ้างอิง"
@@ -37604,8 +37674,8 @@ msgstr "โปรดตรวจสอบว่าคุณต้องการ
msgid "Please mention 'Weight UOM' along with Weight."
msgstr "โปรดระบุ 'หน่วยวัดน้ำหนัก' พร้อมกับน้ำหนัก"
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr "โปรดระบุ '{0}' ในบริษัท: {1}"
@@ -37733,7 +37803,7 @@ msgstr "โปรดเลือกวันที่โพสต์ก่อน
msgid "Please select Posting Date first"
msgstr "โปรดเลือกวันที่โพสต์ก่อน"
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr "โปรดเลือกรายการราคา"
@@ -37765,7 +37835,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr "โปรดเลือก BOM"
@@ -37855,6 +37925,10 @@ 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
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr ""
@@ -37863,7 +37937,7 @@ msgstr ""
msgid "Please select atleast one operation to create Job Card"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr "โปรดเลือกบัญชีที่ถูกต้อง"
@@ -37944,15 +38018,15 @@ msgstr "โปรดเลือก {0} ก่อน"
msgid "Please set 'Apply Additional Discount On'"
msgstr "โปรดตั้งค่า 'ใช้ส่วนลดเพิ่มเติมใน'"
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr "โปรดตั้งค่า 'ศูนย์ต้นทุนค่าเสื่อมราคาสินทรัพย์' ในบริษัท {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr "โปรดตั้งค่า 'บัญชีกำไร/ขาดทุนจากการจำหน่ายสินทรัพย์' ในบริษัท {0}"
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr "โปรดตั้งค่า '{0}' ในบริษัท: {1}"
@@ -37960,7 +38034,7 @@ msgstr "โปรดตั้งค่า '{0}' ในบริษัท: {1}"
msgid "Please set Account"
msgstr "โปรดตั้งค่าบัญชี"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr "โปรดตั้งค่าบัญชีสำหรับจำนวนเงินที่เปลี่ยนแปลง"
@@ -37986,7 +38060,7 @@ msgstr "โปรดตั้งค่ามิติการบัญชี {}
msgid "Please set Company"
msgstr "โปรดตั้งค่าบริษัท"
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr "โปรดตั้งค่าบัญชีที่เกี่ยวข้องกับค่าเสื่อมราคาในหมวดสินทรัพย์ {0} หรือบริษัท {1}"
@@ -38004,7 +38078,7 @@ msgstr ""
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr "โปรดตั้งค่าบัญชีสินทรัพย์ถาวรในหมวดสินทรัพย์ {0}"
@@ -38067,7 +38141,7 @@ msgstr "โปรดตั้งค่าบัญชีในคลังสิ
msgid "Please set an Address on the Company '%s'"
msgstr ""
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr "โปรดตั้งค่าบัญชีค่าใช้จ่ายในตารางรายการ"
@@ -38083,23 +38157,23 @@ msgstr "โปรดตั้งค่าอย่างน้อยหนึ่
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr "โปรดตั้งค่าทั้งหมายเลขประจำตัวผู้เสียภาษีและรหัสการเงินในบริษัท {0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr "โปรดตั้งค่าบัญชีเงินสดหรือธนาคารเริ่มต้นในโหมดการชำระเงิน {0}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr "โปรดตั้งค่าบัญชีเงินสดหรือธนาคารเริ่มต้นในโหมดการชำระเงิน {}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "โปรดตั้งค่าบัญชีเงินสดหรือธนาคารเริ่มต้นในโหมดการชำระเงิน {}"
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr "โปรดตั้งค่าบัญชีกำไร/ขาดทุนจากอัตราแลกเปลี่ยนเริ่มต้นในบริษัท {}"
@@ -38203,7 +38277,7 @@ msgstr "โปรดตั้งค่า {0} เป็น {1} ซึ่งเ
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr "โปรดตั้งค่าและเปิดใช้งานบัญชีกลุ่มด้วยประเภทบัญชี - {0} สำหรับบริษัท {1}"
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr "โปรดแชร์อีเมลนี้กับทีมสนับสนุนของคุณเพื่อให้พวกเขาสามารถค้นหาและแก้ไขปัญหาได้"
@@ -38216,7 +38290,7 @@ msgid "Please specify Company"
msgstr "โปรดระบุบริษัท"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr "โปรดระบุบริษัทเพื่อดำเนินการต่อ"
@@ -38389,6 +38463,7 @@ msgstr "ค่าส่งไปรษณีย์"
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38423,11 +38498,11 @@ 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38446,6 +38521,7 @@ msgstr "ค่าส่งไปรษณีย์"
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38455,6 +38531,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_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
@@ -39020,6 +39097,14 @@ msgstr "รหัสรายการกฎการตั้งราคา"
msgid "Pricing Rule Item Group"
msgstr "กลุ่มรายการกฎการตั้งราคา"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr ""
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr ""
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr "กฎการตั้งราคา {0} ได้รับการอัปเดต"
@@ -39078,6 +39163,10 @@ msgstr "กฎการตั้งราคา {0} ได้รับการ
msgid "Pricing Rules"
msgstr "กฎการตั้งราคา"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr ""
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39465,7 +39554,7 @@ msgstr "คำอธิบายกระบวนการ"
msgid "Process Loss"
msgstr "การสูญเสียกระบวนการ"
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr "เปอร์เซ็นต์การสูญเสียกระบวนการต้องไม่เกิน 100"
@@ -39955,7 +40044,7 @@ msgstr ""
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40430,7 +40519,7 @@ msgstr "การวิเคราะห์การซื้อ"
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr "วันที่ซื้อ"
@@ -40586,7 +40675,7 @@ msgstr "ผู้จัดการมาสเตอร์การซื้อ
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40762,9 +40851,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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41645,6 +41734,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/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
@@ -41761,7 +41851,7 @@ msgstr "ปริมาณต้องไม่เกิน {0}"
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr "ปริมาณของรายการที่ได้รับหลังจากการผลิต/บรรจุใหม่จากปริมาณวัตถุดิบที่กำหนด"
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr "ปริมาณที่ต้องการสำหรับรายการ {0} ในแถว {1}"
@@ -42610,7 +42700,7 @@ msgid "Reason"
msgstr "เหตุผล"
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "เหตุผลในการพักการใช้งาน"
@@ -43046,7 +43136,7 @@ msgstr "แลกกับ"
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr "แลกคะแนนสะสม"
@@ -43178,7 +43268,7 @@ msgstr "วันที่อ้างอิง"
msgid "Reference"
msgstr "อ้างอิง"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr "อ้างอิง #{0} ลงวันที่ {1}"
@@ -43316,7 +43406,7 @@ msgstr "ชื่ออ้างอิง"
msgid "Reference No"
msgstr "หมายเลขอ้างอิง"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr "ต้องระบุหมายเลขอ้างอิงและวันที่อ้างอิงสำหรับ {0}"
@@ -43324,11 +43414,11 @@ msgstr "ต้องระบุหมายเลขอ้างอิงแล
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr "หมายเลขอ้างอิงและวันที่อ้างอิงเป็นสิ่งจำเป็นสำหรับธุรกรรมธนาคาร"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr "หมายเลขอ้างอิงเป็นสิ่งจำเป็นหากคุณป้อนวันที่อ้างอิง"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr "หมายเลขอ้างอิง"
@@ -43442,11 +43532,11 @@ msgstr "อ้างอิง: {0}, รหัสสินค้า: {1} แล
msgid "References"
msgstr "การอ้างอิง"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr "การอ้างอิงถึงใบแจ้งหนี้ขายไม่สมบูรณ์"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr "การอ้างอิงถึงคำสั่งขายไม่สมบูรณ์"
@@ -43591,8 +43681,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43611,7 +43701,7 @@ msgstr "วันที่ปลดปล่อย"
msgid "Remaining"
msgstr "ที่เหลืออยู่"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr "จำนวนเงินที่เหลืออยู่"
@@ -43624,7 +43714,7 @@ msgstr "ยอดคงเหลือที่เหลืออยู่"
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr "ข้อสังเกต"
@@ -43673,7 +43763,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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -43984,7 +44074,7 @@ msgstr "โพสต์ใหม่รายการบัญชีแยกป
msgid "Repost Status"
msgstr "สถานะการโพสต์ใหม่"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr "การโพสต์ใหม่เริ่มต้นในพื้นหลังแล้ว"
@@ -44308,7 +44398,7 @@ msgstr ""
msgid "Reseller"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr ""
@@ -44777,7 +44867,7 @@ msgstr "คืน"
msgid "Return / Credit Note"
msgstr "คืน / ใบลดหนี้"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr "คืน / ใบเพิ่มหนี้"
@@ -45301,12 +45391,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: 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/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "แถว #{0} (ตารางการชำระเงิน): จำนวนเงินต้องเป็นค่าบวก"
@@ -45452,7 +45542,7 @@ msgstr "แถว #{0}: รายการซ้ำในอ้างอิง {
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr "แถว #{0}: วันที่ส่งมอบที่คาดไว้ไม่สามารถก่อนวันที่คำสั่งซื้อได้"
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr "แถว #{0}: ไม่ได้ตั้งค่าบัญชีค่าใช้จ่ายสำหรับรายการ {1} {2}"
@@ -45476,11 +45566,11 @@ msgstr "แถว #{0}: สินค้าสำเร็จรูปต้อ
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr "แถว #{0}: การอ้างอิงสินค้าสำเร็จรูปเป็นสิ่งจำเป็นสำหรับรายการเศษ {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr "แถว #{0}: สำหรับ {1} คุณสามารถเลือกเอกสารอ้างอิงได้เฉพาะเมื่อบัญชีได้รับเครดิต"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr "แถว #{0}: สำหรับ {1} คุณสามารถเลือกเอกสารอ้างอิงได้เฉพาะเมื่อบัญชีถูกหัก"
@@ -45500,7 +45590,7 @@ msgstr "แถว #{0}: เพิ่มรายการแล้ว"
msgid "Row #{0}: Item {1} does not exist"
msgstr "แถว #{0}: รายการ {1} ไม่มีอยู่"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr "แถว #{0}: รายการ {1} ถูกเลือกแล้ว โปรดจองสต็อกจากรายการเลือก"
@@ -45536,7 +45626,7 @@ 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:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr "แถว #{0}: มีเพียง {1} ที่สามารถจองสำหรับรายการ {2}"
@@ -45581,15 +45671,15 @@ msgstr "ปริมาณต้องเป็นตัวเลขบวก"
msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}."
msgstr "ปริมาณควรน้อยกว่าหรือเท่ากับปริมาณที่สามารถจองได้ (ปริมาณจริง - ปริมาณที่จอง) {1} สำหรับรายการ {2} ในแบทช์ {3} ในคลังสินค้า {4}"
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr "ต้องการการตรวจสอบคุณภาพสำหรับรายการ {1}"
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr "การตรวจสอบคุณภาพ {1} ยังไม่ได้ส่งสำหรับรายการ: {2}"
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr "การตรวจสอบคุณภาพ {1} ถูกปฏิเสธสำหรับรายการ {2}"
@@ -45598,7 +45688,7 @@ msgstr "การตรวจสอบคุณภาพ {1} ถูกปฏิ
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "ปริมาณสำหรับรายการ {1} ไม่สามารถเป็นศูนย์ได้"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr "ปริมาณที่จะจองสำหรับรายการ {1} ควรมากกว่า 0"
@@ -45692,19 +45782,19 @@ msgstr "สถานะต้องเป็น {1} สำหรับการ
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
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:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr "ไม่สามารถจองสต็อกในคลังสินค้ากลุ่ม {1} ได้"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr "สต็อกถูกจองไว้แล้วสำหรับรายการ {1}"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr "สต็อกถูกจองสำหรับรายการ {1} ในคลังสินค้า {2}"
@@ -45712,8 +45802,8 @@ msgstr "สต็อกถูกจองสำหรับรายการ {1
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr "ไม่มีสต็อกสำหรับจองสำหรับรายการ {1} ในคลังสินค้า {2}"
@@ -45894,7 +45984,7 @@ msgstr "แถว {0}# รายการ {1} ไม่พบในตารา
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr "แถว {0}: ปริมาณที่ยอมรับและปริมาณที่ปฏิเสธไม่สามารถเป็นศูนย์พร้อมกันได้"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr "แถว {0}: บัญชี {1} และประเภทคู่สัญญา {2} มีประเภทบัญชีที่แตกต่างกัน"
@@ -45902,11 +45992,11 @@ msgstr "แถว {0}: บัญชี {1} และประเภทคู่
msgid "Row {0}: Activity Type is mandatory."
msgstr "แถว {0}: ประเภทกิจกรรมเป็นสิ่งจำเป็น"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr "แถว {0}: การล่วงหน้ากับลูกค้าต้องเป็นเครดิต"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr "แถว {0}: การล่วงหน้ากับผู้จัดจำหน่ายต้องเป็นเดบิต"
@@ -45926,7 +46016,7 @@ msgstr "แถว {0}: เนื่องจาก {1} ถูกเปิดใ
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr "แถว {0}: ไม่พบใบกำกับวัสดุสำหรับรายการ {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr "แถว {0}: ค่าเดบิตและเครดิตไม่สามารถเป็นศูนย์ได้"
@@ -45942,7 +46032,7 @@ msgstr "แถว {0}: ศูนย์ต้นทุน {1} ไม่ได้
msgid "Row {0}: Cost center is required for an item {1}"
msgstr "แถว {0}: ต้องการศูนย์ต้นทุนสำหรับรายการ {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr "แถว {0}: รายการเครดิตไม่สามารถเชื่อมโยงกับ {1} ได้"
@@ -45950,7 +46040,7 @@ msgstr "แถว {0}: รายการเครดิตไม่สามา
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr "แถว {0}: สกุลเงินของ BOM #{1} ควรเท่ากับสกุลเงินที่เลือก {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr "แถว {0}: รายการเดบิตไม่สามารถเชื่อมโยงกับ {1} ได้"
@@ -45966,7 +46056,7 @@ msgstr "แถว {0}: วันที่ครบกำหนดในตาร
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr "แถว {0}: ต้องการการอ้างอิงรายการใบส่งของหรือรายการที่บรรจุ"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "แถว {0}: อัตราแลกเปลี่ยนเป็นสิ่งจำเป็น"
@@ -46000,7 +46090,7 @@ msgstr "แถว {0}: เวลาเริ่มต้นและเวลา
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr "แถว {0}: เวลาเริ่มต้นและเวลาสิ้นสุดของ {1} ทับซ้อนกับ {2}"
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr "แถว {0}: คลังสินค้าเริ่มต้นเป็นสิ่งจำเป็นสำหรับการโอนภายใน"
@@ -46012,7 +46102,7 @@ msgstr "แถว {0}: เวลาเริ่มต้นต้องน้อ
msgid "Row {0}: Hours value must be greater than zero."
msgstr "แถว {0}: ค่าชั่วโมงต้องมากกว่าศูนย์"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr "แถว {0}: การอ้างอิง {1} ไม่ถูกต้อง"
@@ -46036,7 +46126,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr "แถว {0}: ปริมาณที่บรรจุต้องเท่ากับปริมาณ {1}"
@@ -46044,7 +46134,7 @@ msgstr "แถว {0}: ปริมาณที่บรรจุต้องเ
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr "แถว {0}: ใบบรรจุถูกสร้างขึ้นแล้วสำหรับรายการ {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr "แถว {0}: คู่สัญญา/บัญชีไม่ตรงกับ {1} / {2} ใน {3} {4}"
@@ -46056,11 +46146,11 @@ msgstr "แถว {0}: ต้องการประเภทคู่สัญ
msgid "Row {0}: Payment Term is mandatory"
msgstr "แถว {0}: เงื่อนไขการชำระเงินเป็นสิ่งจำเป็น"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr "แถว {0}: การชำระเงินกับคำสั่งขาย/ซื้อควรถูกทำเครื่องหมายเป็นล่วงหน้าเสมอ"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr "แถว {0}: โปรดตรวจสอบ 'เป็นล่วงหน้า' กับบัญชี {1} หากนี่เป็นรายการล่วงหน้า"
@@ -46128,7 +46218,7 @@ msgstr "แถว {0}: ไม่สามารถเปลี่ยนกะไ
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr "แถว {0}: รายการจ้างช่วงเป็นสิ่งจำเป็นสำหรับวัตถุดิบ {1}"
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr "แถว {0}: คลังสินค้าเป้าหมายเป็นสิ่งจำเป็นสำหรับการโอนภายใน"
@@ -46152,7 +46242,7 @@ msgstr "แถว {0}: ในการตั้งค่าความถี่
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "แถว {0}: ปัจจัยการแปลงหน่วยวัดเป็นสิ่งจำเป็น"
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: 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}"
@@ -46173,7 +46263,7 @@ msgstr "แถว {0}: {1} ต้องมากกว่า 0"
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr "แถว {0}: {1} {2} ไม่สามารถเหมือนกับ {3} (บัญชีคู่สัญญา) {4}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr "แถว {0}: {1} {2} ไม่ตรงกับ {3}"
@@ -46566,7 +46656,7 @@ msgstr "ใบแจ้งหนี้ขายไม่ได้ถูกสร
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr "โหมดใบแจ้งหนี้ขายถูกเปิดใช้งานใน POS โปรดสร้างใบแจ้งหนี้ขายแทน"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr "ใบแจ้งหนี้ขาย {0} ถูกส่งแล้ว"
@@ -46795,7 +46885,7 @@ msgstr "สถานะคำสั่งขาย"
msgid "Sales Order Trends"
msgstr "แนวโน้มคำสั่งขาย"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr "ต้องการคำสั่งขายสำหรับรายการ {0}"
@@ -47305,8 +47395,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47577,7 +47667,7 @@ msgstr ""
msgid "Scrap Warehouse"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr ""
@@ -47650,7 +47740,7 @@ msgstr ""
msgid "Section"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr ""
@@ -48020,7 +48110,7 @@ msgstr "เลือกเพื่อทำให้ลูกค้าสาม
msgid "Selected POS Opening Entry should be open."
msgstr "รายการเปิด POS ที่เลือกควรเปิดอยู่"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr "รายการราคาที่เลือกควรมีการตรวจสอบฟิลด์การซื้อและขาย"
@@ -48204,7 +48294,7 @@ msgstr "ส่งพร้อมไฟล์แนบ"
msgid "Sender"
msgstr "ผู้ส่ง"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr "กำลังส่ง"
@@ -48328,7 +48418,9 @@ msgstr ""
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48359,7 +48451,9 @@ msgid "Serial No Count"
msgstr ""
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr ""
@@ -48367,7 +48461,7 @@ msgstr ""
msgid "Serial No Range"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr ""
@@ -48407,6 +48501,13 @@ msgstr ""
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr ""
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr ""
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr ""
@@ -48436,7 +48537,7 @@ msgstr ""
msgid "Serial No {0} does not exist"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr ""
@@ -48485,7 +48586,7 @@ msgstr ""
msgid "Serial Nos and Batches"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr ""
@@ -48563,11 +48664,11 @@ msgstr ""
msgid "Serial and Batch Bundle"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr ""
@@ -49001,7 +49102,7 @@ msgstr "ตั้งค่าต้นทุนที่มาถึงตาม
msgid "Set Loyalty Program"
msgstr "ตั้งค่าโปรแกรมสะสมคะแนน"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr "ตั้งค่าวันที่เผยแพร่ใหม่"
@@ -49256,7 +49357,7 @@ msgstr "การตั้งค่าบัญชีเป็นบัญชี
msgid "Setting up company"
msgstr "กำลังตั้งค่าบริษัท"
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49440,7 +49541,7 @@ msgstr "ประเภทการจัดส่ง"
msgid "Shipment details"
msgstr "รายละเอียดการจัดส่ง"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr "การจัดส่ง"
@@ -49687,6 +49788,10 @@ msgstr "แสดงรายการที่ถูกยกเลิก"
msgid "Show Completed"
msgstr "แสดงที่เสร็จสมบูรณ์"
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr ""
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr "แสดงจำนวนเงินสะสม"
@@ -49802,7 +49907,7 @@ msgstr "แสดงตัวอย่าง"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr "แสดงข้อสังเกต"
@@ -50107,13 +50212,27 @@ msgstr ""
msgid "Source DocType"
msgstr ""
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr ""
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr "ชื่อเอกสารต้นทาง"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr ""
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr "ประเภทเอกสารต้นทาง"
@@ -50184,7 +50303,7 @@ msgstr "ที่อยู่คลังสินค้าต้นทาง"
msgid "Source Warehouse Address Link"
msgstr "ลิงก์ที่อยู่คลังสินค้าต้นทาง"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr "คลังสินค้าต้นทางเป็นสิ่งจำเป็นสำหรับรายการ {0}"
@@ -50695,7 +50814,7 @@ msgstr ""
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51038,7 +51157,7 @@ msgstr "สร้างรายการสต็อก {0} แล้ว"
msgid "Stock Entry {0} has created"
msgstr "รายการสต็อก {0} ถูกสร้างขึ้นแล้ว"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr "รายการสต็อก {0} ยังไม่ได้ส่ง"
@@ -51261,13 +51380,13 @@ msgstr "การตั้งค่าโพสต์สต็อกใหม่
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51276,13 +51395,13 @@ msgstr "การตั้งค่าโพสต์สต็อกใหม่
msgid "Stock Reservation"
msgstr "การจองสต็อก"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr "ยกเลิกรายการจองสต็อกแล้ว"
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr "สร้างรายการจองสต็อกแล้ว"
@@ -51304,7 +51423,7 @@ msgstr "ไม่สามารถอัปเดตรายการจอง
msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr "ไม่สามารถอัปเดตรายการจองสต็อกที่สร้างขึ้นสำหรับรายการเลือกได้ หากคุณต้องการเปลี่ยนแปลง เราแนะนำให้ยกเลิกรายการที่มีอยู่และสร้างรายการใหม่"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr "คลังสินค้าการจองสต็อกไม่ตรงกัน"
@@ -51549,7 +51668,7 @@ msgstr "สต็อกและการผลิต"
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr "ไม่สามารถจองสต็อกในคลังสินค้ากลุ่ม {0} ได้"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr "ไม่สามารถจองสต็อกในคลังสินค้ากลุ่ม {0} ได้"
@@ -51565,7 +51684,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr "สต็อกถูกยกเลิกการจองสำหรับคำสั่งงาน {0}"
@@ -52433,10 +52552,15 @@ 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr ""
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52549,7 +52673,7 @@ msgstr "ใบแจ้งหนี้ผู้จัดจำหน่าย"
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr "วันที่ใบแจ้งหนี้ผู้จัดจำหน่าย"
@@ -52563,8 +52687,8 @@ 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "หมายเลขใบแจ้งหนี้ผู้จัดจำหน่าย"
@@ -53111,16 +53235,16 @@ msgstr "ระบบจะไม่ตรวจสอบการเรียก
msgid "System will notify to increase or decrease quantity or amount "
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr ""
@@ -53137,7 +53261,7 @@ msgstr ""
msgid "TDS Payable"
msgstr "ภาษีหัก ณ ที่จ่าย"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr ""
@@ -53693,7 +53817,7 @@ msgstr ""
msgid "Tax Withheld Vouchers"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr ""
@@ -54318,7 +54442,7 @@ msgstr ""
msgid "The BOM which will be replaced"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr ""
@@ -54346,7 +54470,7 @@ msgstr ""
msgid "The Loyalty Program isn't valid for the selected company"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr ""
@@ -54370,7 +54494,7 @@ msgstr ""
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr ""
@@ -54392,7 +54516,7 @@ msgstr ""
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr ""
@@ -54433,7 +54557,7 @@ msgstr "ฟิลด์จากผู้ถือหุ้นต้องไม
msgid "The field To Shareholder cannot be blank"
msgstr "ฟิลด์ถึงผู้ถือหุ้นต้องไม่ว่างเปล่า"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr "ฟิลด์ {0} ในแถว {1} ไม่ได้ตั้งค่า"
@@ -54449,7 +54573,7 @@ msgstr "หมายเลขโฟลิโอไม่ตรงกัน"
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr "รายการต่อไปนี้ที่มีข้อกำหนดการจัดเก็บไม่สามารถรองรับได้:"
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr "สินทรัพย์ต่อไปนี้ล้มเหลวในการโพสต์รายการค่าเสื่อมราคาโดยอัตโนมัติ: {0}"
@@ -54710,6 +54834,10 @@ msgstr ""
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr "{0} {1} ถูกใช้ในการคำนวณต้นทุนการประเมินมูลค่าสำหรับสินค้าสำเร็จรูป {2}"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr ""
@@ -54976,7 +55104,7 @@ msgstr "กำหนดการนี้ถูกสร้างขึ้นเ
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr "กำหนดการนี้ถูกสร้างขึ้นเมื่อสินทรัพย์ {0} ถูกคืนค่าเนื่องจากการยกเลิกการเพิ่มทุนสินทรัพย์ {1}"
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr "กำหนดการนี้ถูกสร้างขึ้นเมื่อสินทรัพย์ {0} ถูกคืนค่า"
@@ -54984,7 +55112,7 @@ msgstr "กำหนดการนี้ถูกสร้างขึ้นเ
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr "กำหนดการนี้ถูกสร้างขึ้นเมื่อสินทรัพย์ {0} ถูกคืนผ่านใบแจ้งหนี้ขาย {1}"
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr "กำหนดการนี้ถูกสร้างขึ้นเมื่อสินทรัพย์ {0} ถูกทิ้ง"
@@ -55759,6 +55887,10 @@ msgstr "เพื่อรวมภาษีในแถว {0} ในอัต
msgid "To merge, following properties must be same for both items"
msgstr "เพื่อรวม คุณสมบัติต่อไปนี้ต้องเหมือนกันสำหรับทั้งสองรายการ"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr "เพื่อยกเลิกกฎนี้ ให้เปิดใช้งาน '{0}' ในบริษัท {1}"
@@ -55776,7 +55908,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr "เพื่อส่งใบแจ้งหนี้โดยไม่มีใบรับซื้อ โปรดตั้งค่า {0} เป็น {1} ใน {2}"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr "เพื่อใช้สมุดการเงินที่แตกต่าง โปรดยกเลิกการเลือก 'รวมสินทรัพย์ FB เริ่มต้น'"
@@ -55998,7 +56130,7 @@ msgstr "รวมการจัดสรร"
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56160,7 +56292,7 @@ msgstr "จำนวนเครดิต/เดบิตรวมควรเ
msgid "Total Debit"
msgstr "รวมเดบิต"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr "รวมเดบิตต้องเท่ากับรวมเครดิต ความแตกต่างคือ {0}"
@@ -56753,6 +56885,10 @@ msgstr "รวมทั้งหมด"
msgid "Traceability"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr ""
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56793,7 +56929,7 @@ msgstr "URL การติดตาม"
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -56891,7 +57027,7 @@ msgstr "การตั้งค่าธุรกรรม"
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr "ประเภทธุรกรรม"
@@ -56913,7 +57049,7 @@ msgstr "หมายเลขอ้างอิงธุรกรรม {0} ล
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57510,7 +57646,11 @@ msgstr "จำนวนเงินที่ไม่ได้จัดสรร
msgid "Unassigned Qty"
msgstr "ปริมาณที่ไม่ได้กำหนด"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr "ปลดบล็อกใบแจ้งหนี้"
@@ -58877,7 +59017,7 @@ msgstr ""
msgid "Vendor Invoices"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr "ชื่อผู้ขาย"
@@ -58944,7 +59084,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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59135,11 +59275,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59174,7 +59314,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr "ประเภทใบสำคัญย่อย"
@@ -59206,9 +59346,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59227,6 +59367,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_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
@@ -59436,6 +59577,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_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
@@ -59544,7 +59686,7 @@ msgstr "คลังสินค้าและการอ้างอิง"
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr "ไม่สามารถลบคลังสินค้าได้เนื่องจากมีรายการบัญชีสต็อกสำหรับคลังสินค้านี้"
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr "ไม่สามารถเปลี่ยนคลังสินค้าสำหรับหมายเลขซีเรียลได้"
@@ -59557,7 +59699,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:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr "ต้องการคลังสินค้าสำหรับรายการสต็อก {0}"
@@ -59708,7 +59850,7 @@ msgstr "คำเตือนเกี่ยวกับสต็อกติด
msgid "Warning!"
msgstr "คำเตือน!"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr "คำเตือน: มี {0} # {1} อื่นที่มีอยู่สำหรับรายการสต็อก {2}"
@@ -60191,6 +60333,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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "คำสั่งงาน"
@@ -60666,7 +60809,7 @@ msgstr "คุณกำลังนำเข้าข้อมูลสำหร
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr "คุณไม่ได้รับอนุญาตให้อัปเดตตามเงื่อนไขที่ตั้งไว้ในเวิร์กโฟลว์ {}"
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr "คุณไม่ได้รับอนุญาตให้เพิ่มหรืออัปเดตรายการก่อน {0}"
@@ -60698,7 +60841,7 @@ msgstr "คุณยังสามารถตั้งค่าบัญชี
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr "คุณสามารถเปลี่ยนบัญชีหลักเป็นบัญชีงบดุลหรือเลือกบัญชีอื่น"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr "คุณไม่สามารถป้อนใบสำคัญปัจจุบันในคอลัมน์ 'Against Journal Entry' ได้"
@@ -60715,7 +60858,7 @@ msgstr "คุณสามารถแลกคะแนนได้สูงส
msgid "You can only select one mode of payment as default"
msgstr "คุณสามารถเลือกวิธีการชำระเงินได้เพียงวิธีเดียวเป็นค่าเริ่มต้น"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr "คุณสามารถแลกได้สูงสุด {0}"
@@ -60747,11 +60890,11 @@ msgstr "คุณไม่สามารถสร้าง {0} ภายใน
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr "คุณไม่สามารถสร้างหรือยกเลิกรายการบัญชีใด ๆ ภายในช่วงเวลาบัญชีที่ปิด {0}"
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr "คุณไม่สามารถสร้าง/แก้ไขรายการบัญชีใด ๆ จนถึงวันนี้"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr "คุณไม่สามารถให้เครดิตและเดบิตบัญชีเดียวกันในเวลาเดียวกัน"
@@ -60767,7 +60910,7 @@ msgstr "คุณไม่สามารถแก้ไขโหนดราก
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr "คุณไม่สามารถแลกได้มากกว่า {0}"
@@ -60799,7 +60942,7 @@ msgstr "คุณไม่มีสิทธิ์ {} รายการใน {
msgid "You don't have enough Loyalty Points to redeem"
msgstr "คุณไม่มีคะแนนสะสมเพียงพอที่จะแลก"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr "คุณไม่มีคะแนนเพียงพอที่จะแลก"
@@ -61225,7 +61368,7 @@ msgstr "ชื่อเรื่อง"
msgid "to"
msgstr "ถึง"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr "เพื่อยกเลิกการจัดสรรจำนวนเงินของใบแจ้งหนี้คืนนี้ก่อนที่จะยกเลิก"
@@ -61265,7 +61408,7 @@ msgstr ""
msgid "{0} '{1}' is disabled"
msgstr "{0} '{1}' ถูกปิดใช้งาน"
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr "{0} '{1}' ไม่อยู่ในปีงบประมาณ {2}"
@@ -61297,7 +61440,7 @@ msgstr "คูปอง {0} ที่ใช้คือ {1} ปริมาณ
msgid "{0} Digest"
msgstr "สรุป {0}"
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr "หมายเลข {0} {1} ถูกใช้แล้วใน {2} {3}"
@@ -61313,7 +61456,7 @@ msgstr "คำขอ {0} สำหรับ {1}"
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr "การเก็บตัวอย่าง {0} ขึ้นอยู่กับแบทช์ โปรดตรวจสอบว่ามีหมายเลขแบทช์เพื่อเก็บตัวอย่างของรายการ"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr "ธุรกรรม {0} ได้รับการกระทบยอด"
@@ -61329,19 +61472,19 @@ msgstr "บัญชี {0} ไม่ใช่ประเภท {1}"
msgid "{0} account not found while submitting purchase receipt"
msgstr "ไม่พบบัญชี {0} ขณะส่งใบรับซื้อ"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr "{0} เทียบกับบิล {1} ลงวันที่ {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr "{0} เทียบกับคำสั่งซื้อ {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr "{0} เทียบกับใบแจ้งหนี้ขาย {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr "{0} เทียบกับคำสั่งขาย {1}"
@@ -61349,7 +61492,7 @@ msgstr "{0} เทียบกับคำสั่งขาย {1}"
msgid "{0} already has a Parent Procedure {1}."
msgstr "{0} มีขั้นตอนหลัก {1} อยู่แล้ว"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr "{0} และ {1}"
@@ -61408,7 +61551,7 @@ msgstr "{0} ป้อนสองครั้งในภาษีรายก
msgid "{0} entered twice {1} in Item Taxes"
msgstr "{0} ป้อนสองครั้ง {1} ในภาษีรายการ"
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr "{0} สำหรับ {1}"
@@ -61461,7 +61604,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr "{0} เป็นสิ่งจำเป็นสำหรับรายการ {1}"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr "{0} เป็นสิ่งจำเป็นสำหรับบัญชี {1}"
@@ -61536,7 +61679,7 @@ msgstr "{0} รายการที่ผลิต"
msgid "{0} must be negative in return document"
msgstr "{0} ต้องเป็นค่าลบในเอกสารคืน"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr "{0} ไม่อนุญาตให้ทำธุรกรรมกับ {1} โปรดเปลี่ยนบริษัทหรือเพิ่มบริษัทในส่วน 'อนุญาตให้ทำธุรกรรมด้วย' ในระเบียนลูกค้า"
@@ -61552,7 +61695,7 @@ msgstr "พารามิเตอร์ {0} ไม่ถูกต้อง"
msgid "{0} payment entries can not be filtered by {1}"
msgstr "ไม่สามารถกรองรายการชำระเงิน {0} ด้วย {1} ได้"
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr "ปริมาณ {0} ของรายการ {1} กำลังถูกรับเข้าสู่คลังสินค้า {2} ที่มีความจุ {3}"
@@ -61613,7 +61756,7 @@ msgstr ""
msgid "{0} {1} Manually"
msgstr "{0} {1} ด้วยตนเอง"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr "{0} {1} กระทบยอดบางส่วน"
@@ -61678,7 +61821,7 @@ msgstr "{0} {1} ถูกยกเลิกหรือหยุดแล้ว"
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr "{0} {1} ถูกยกเลิก ดังนั้นการดำเนินการไม่สามารถเสร็จสิ้นได้"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr "{0} {1} ถูกปิดแล้ว"
@@ -61690,7 +61833,7 @@ msgstr "{0} {1} ถูกปิดใช้งาน"
msgid "{0} {1} is frozen"
msgstr "{0} {1} ถูกแช่แข็ง"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr "{0} {1} ถูกเรียกเก็บเงินเต็มจำนวนแล้ว"
@@ -61702,12 +61845,12 @@ msgstr "{0} {1} ไม่ได้ใช้งาน"
msgid "{0} {1} is not associated with {2} {3}"
msgstr "{0} {1} ไม่ได้เชื่อมโยงกับ {2} {3}"
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr "{0} {1} ไม่ได้อยู่ในปีงบประมาณที่ใช้งานอยู่"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr "{0} {1} ยังไม่ได้ส่ง"
@@ -61719,7 +61862,7 @@ msgstr "{0} {1} ถูกระงับ"
msgid "{0} {1} must be submitted"
msgstr "{0} {1} ต้องถูกส่ง"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr "{0} {1} ไม่อนุญาตให้โพสต์ใหม่ โปรดแก้ไข {2} เพื่อเปิดใช้งานการโพสต์ใหม่"
@@ -61754,7 +61897,7 @@ msgstr "{0} {1}: บัญชี {2} ไม่ได้ใช้งาน"
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr "{0} {1}: รายการบัญชีสำหรับ {2} สามารถทำได้เฉพาะในสกุลเงิน: {3}"
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr "{0} {1}: ศูนย์ต้นทุนเป็นสิ่งจำเป็นสำหรับรายการ {2}"
@@ -61832,7 +61975,7 @@ msgstr "{doctype} {name} ถูกยกเลิกหรือปิดแล
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr "{field_label} เป็นสิ่งจำเป็นสำหรับ {doctype} ที่จ้างช่วง"
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr "ขนาดตัวอย่าง ({sample_size}) ของ {item_name} ต้องไม่เกินปริมาณที่ยอมรับได้ ({accepted_quantity})"
@@ -61840,7 +61983,7 @@ msgstr "ขนาดตัวอย่าง ({sample_size}) ของ {item_nam
msgid "{ref_doctype} {ref_name} is {status}."
msgstr "{ref_doctype} {ref_name} มีสถานะ {status}"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr ""
@@ -61898,7 +62041,7 @@ msgstr ""
msgid "{} To Bill"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr "{} ไม่สามารถยกเลิกได้เนื่องจากคะแนนสะสมที่ได้รับถูกแลกไปแล้ว โปรดยกเลิก {} หมายเลข {} ก่อน"
diff --git a/erpnext/locale/tr.po b/erpnext/locale/tr.po
index ea5ffed50d3..f2216e47a23 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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:10\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:06\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Turkish\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr " Ürün"
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr "'Son Siparişten bu yana geçen süre' sıfırdan büyük veya sıfıra
msgid "'Default {0} Account' in Company {1}"
msgstr "Şirket {1} için Varsayılan {0} Hesabı"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr "'Girdiler' boş olamaz"
@@ -919,11 +919,11 @@ msgstr "Kısayollar\n"
msgid "Your Shortcuts"
msgstr "Kısayollar"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr "Genel Toplam: {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr "Ödenmemiş Tutar: {0}"
@@ -1319,10 +1319,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1627,7 +1627,7 @@ msgstr "Hesap {0}: Ana hesap {1} mevcut değil"
msgid "Account {0}: You can not assign itself as parent account"
msgstr "Hesap {0}: Kendi kendine ana hesap olarak atayamazsınız"
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr "Hesap: {0} sermaye olarak Devam Eden İşler’dir ve Muhasebe Kaydı ile güncellenemez."
@@ -2116,7 +2116,7 @@ msgstr "Hesaplar Bugüne Kadar Donduruldu"
msgid "Accounts Manager"
msgstr "Muhasebe Yöneticisi"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr "Hesap Eksik Hatası"
@@ -2303,7 +2303,7 @@ msgstr "Muhasebe Ayarları"
msgid "Accounts User"
msgstr "Muhasebe Kullanıcısı"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr "Hesaplar tablosu boş bırakılamaz."
@@ -2663,6 +2663,10 @@ msgstr "Gerçek Bitiş Zamanı"
msgid "Actual Expense"
msgstr "Gerçekleşen Gider"
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr ""
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2800,7 +2804,7 @@ msgstr "Fiyat Ekle / Düzenle"
msgid "Add Child"
msgstr "Alt Öğe Ekle"
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr "İşlem Para Birimini Ekle"
@@ -3606,7 +3610,7 @@ msgstr "Avans Tutarı"
msgid "Advance amount cannot be greater than {0} {1}"
msgstr "{0} Avans miktarı {1} tutarından fazla olamaz."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr "{0} {1} karşılığında ödenen avans, Genel Toplam {2} tutarından fazla olamaz."
@@ -3663,7 +3667,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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr "Hesap"
@@ -3732,7 +3736,7 @@ msgstr "Karşılık Gider Hesabı"
msgid "Against Income Account"
msgstr "Karşılık Gelir Hesabı"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr "Yevmiye Kaydı {0} karşılığında eşleşmemiş {1} kaydı bulunmamaktadır."
@@ -3780,7 +3784,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr "Fatura"
@@ -3792,7 +3796,7 @@ msgstr "Fatura"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr "İlgili Belge No"
@@ -3804,8 +3808,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr "Fatura Türü"
@@ -3931,7 +3935,7 @@ msgstr "Tümü"
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr "Tüm Hesaplar"
@@ -4099,7 +4103,7 @@ msgstr "Tüm ürünler zaten talep edildi"
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:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr "Tüm ürünler zaten alındı"
@@ -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 "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:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr "Bu öğelerin tümü zaten Faturalandırılmış/İade edilmiştir"
@@ -5011,7 +5015,7 @@ msgstr "Değiştirildi"
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5151,7 +5155,7 @@ msgstr "Miktar (Şekil)"
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr "Hesap Para Birimindeki Tutar"
@@ -5302,7 +5306,7 @@ msgstr "{4} mali yılı için {1} '{2}' ve '{3}' hesabında başka bir Bütçe k
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr "Başka bir Maliyet Merkezi Tahsis kaydı {0} {1} tarihinden itibaren geçerlidir, dolayısıyla bu tahsis {2} tarihine kadar geçerli olacaktır"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr "Başka bir Ödeme Talebi zaten işleme alındı"
@@ -5885,7 +5889,7 @@ msgstr "Varlık Sermayesi Stok Kalemi"
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5927,7 +5931,7 @@ msgstr "Varlık Amortisman Programı"
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr "Varlık Amortisman Programı {0} ve Finans Defteri {1} için vardiya bazlı amortisman kullanmıyor"
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr "Varlık Amortisman Programı Varlık {0} ve Finans Defteri {1} için bulunamadı"
@@ -5966,7 +5970,7 @@ msgstr "Varlık Elden Çıkarma"
msgid "Asset Finance Book"
msgstr "Varlık Finans Defteri"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr "Varlık Kimliği"
@@ -6042,7 +6046,7 @@ msgstr "Varlık Hareket kaydı {0} oluşturuldu"
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr "Varlık İsmi"
@@ -6128,9 +6132,9 @@ msgstr "Varlık Durumu"
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr "Varlık Değeri"
@@ -6159,7 +6163,7 @@ msgstr "Varlık iptal edildi"
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "Varlık iptal edilemez, çünkü zaten {0} durumda"
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr "Varlık, son amortisman girişinden önce hurdaya çıkarılamaz."
@@ -6191,7 +6195,7 @@ msgstr "Varlık, {0} nedeniyle onarımda ve şuan devre dışı."
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr "Varlık {0} Konumunda alındı ve {1} Çalışanına verildi"
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr "Varlık geri yüklendi"
@@ -6203,11 +6207,11 @@ msgstr "Varlık Sermayelendirmesi {0} iptal edildikten sonra varlık geri yükle
msgid "Asset returned"
msgstr "Varlık iade edildi"
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr "Varlık hurdaya çıkarıldı"
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr "Varlık, Yevmiye Kaydı {0} ile hurdaya ayrıldı"
@@ -6232,7 +6236,7 @@ msgstr "Varlık, Varlığa bölündükten sonra güncellendi {0}"
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr "Varlık {0} hurdaya ayrılamaz, çünkü zaten {1} durumda"
@@ -6265,7 +6269,15 @@ msgstr "Varlık {0} güncellendi. Lütfen varsa amortisman ayrıntılarını aya
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr ""
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr "Varlık {0} kaydedilmelidir"
@@ -6646,7 +6658,7 @@ msgstr "Otomatik Mutabakat"
msgid "Auto Reconcile Payments"
msgstr "Otomatik Ödeme Mutabakatı"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr "Otomatik Mutabakat"
@@ -6656,7 +6668,7 @@ msgstr "Otomatik Mutabakat"
msgid "Auto Reconciliation Job Trigger"
msgstr "Otomatik Mutabakat İşlemi Tetikleyicisi"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr ""
@@ -6831,7 +6843,7 @@ msgstr "Depodaki Mevcut Parti Miktarı"
msgid "Available Batch Report"
msgstr "Mevcut Parti Raporu"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr "Kullanıma Hazır Tarihi"
@@ -7060,7 +7072,7 @@ msgstr "Ürün Ağacı"
msgid "BOM 1"
msgstr "Ürün Ağacı 1"
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
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"
@@ -7298,23 +7310,23 @@ msgstr "Ürün Ağacı herhangi bir stok kalemi içermiyor"
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr "Ürün Ağacı yinelemesi: {0}, {1} alt öğesi olamaz"
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
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:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
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:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr "{0} Ürün Ağacı aktif olmalıdır"
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr "{0} Ürün Ağacı kaydedilmelidir"
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr "{1} Ürünü için {0} Ürün Ağacı bulunamadı"
@@ -7385,7 +7397,7 @@ msgstr "Bakiye"
msgid "Balance (Dr - Cr)"
msgstr "Bakiye (Borç - Alacak)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr "Bakiye ({0})"
@@ -7864,7 +7876,7 @@ msgstr "Taban Fiyat"
msgid "Base Tax Withholding Net Total"
msgstr "Vergi Stopajı Net Taban Toplamı"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr "Birim Toplam"
@@ -8069,7 +8081,9 @@ msgstr "Parti Ürünü Son Kullanma Durumu"
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -8080,7 +8094,7 @@ msgstr "Parti No"
msgid "Batch No is mandatory"
msgstr "Parti Numarası Zorunlu"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr "Parti No {0} mevcut değil"
@@ -8103,7 +8117,7 @@ msgstr "Parti No."
msgid "Batch Nos"
msgstr "Parti Numaraları"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr "Parti Numaraları başarıyla oluşturuldu"
@@ -8116,7 +8130,7 @@ msgstr "Parti İade İçin Uygun Değil"
msgid "Batch Number Series"
msgstr "Parti Numarası Serisi"
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr "Parti Miktarı"
@@ -8229,7 +8243,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8542,8 +8556,8 @@ msgstr "Açık Sipariş Ürünü"
msgid "Blanket Order Rate"
msgstr "Genel Sipariş Fiyatı"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr "Faturayı Engelle"
@@ -8659,7 +8673,7 @@ msgstr "Ayrılmış Sabit Varlık"
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr "Stok değerinin birden fazla hesaba kaydedilmesi, stok ve hesap değerinin izlenmesini zorlaştıracaktır."
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr "Defterler {0} adresinde sona eren döneme kadar kapatılmıştır."
@@ -9433,7 +9447,7 @@ msgstr "Ödeme Yöntemine göre gruplandırılırsa, Ödeme Yöntemine göre fil
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr "Belgelerle gruplandırılmışsa, Belge No ile filtreleme yapılamaz."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr "Sadece faturalandırılmamış ödemeler yapılabilir {0}"
@@ -9619,7 +9633,7 @@ msgstr "Sürücü Adresi Eksik Olduğu İçin Rota Optimize Edilemiyor."
msgid "Cannot Relieve Employee"
msgstr "Çalışan İşten Ayrılamıyor"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr "Kapalı mali yıldaki fişler için Defter girişleri Yeniden Gönderilemez."
@@ -9635,6 +9649,10 @@ msgstr "Bir girişte birden fazla tarafa karşı Stopaj Vergisi uygulanamaz"
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr "Stok Defterine girişi olan bir kalem Sabit Varlık olarak ayarlanamaz."
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr ""
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr ""
@@ -9724,7 +9742,7 @@ msgstr ""
msgid "Cannot create root account."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
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."
@@ -9741,7 +9759,7 @@ msgstr "'Değerleme' veya 'Değerleme ve Toplam' kategorisi için çıkarma işl
msgid "Cannot delete Exchange Gain/Loss row"
msgstr "Kur Farkı Satırı Silinemiyor"
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr "{0} Seri Numarası stok işlemlerinde kullanıldığından silinemiyor"
@@ -10187,11 +10205,11 @@ msgstr "Zincir"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr "Değişim Tutarı"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr "Yayın Tarihi Değiştir"
@@ -10204,7 +10222,7 @@ msgstr "Yayın Tarihi Değiştir"
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr "Stok Değerindeki Değişim"
@@ -11012,6 +11030,7 @@ msgstr "Şirketler"
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11159,6 +11178,7 @@ msgstr "Şirketler"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11244,8 +11264,8 @@ msgstr "Şirketler"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11561,7 +11581,7 @@ msgstr "Şirket Vergi Numarası"
msgid "Company and Posting Date is mandatory"
msgstr "Şirket ve Kaydetme Tarihi zorunludur"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr "Şirketler Arası İşlemler için her iki şirketin para birimlerinin eşleşmesi gerekir."
@@ -12842,7 +12862,7 @@ 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12861,7 +12881,7 @@ msgstr "Maliyet"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -13074,7 +13094,7 @@ msgstr "Demo Verileri Silinemedi"
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:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
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"
@@ -13197,15 +13217,15 @@ msgstr "Alacak"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13447,7 +13467,7 @@ msgstr "Fırsat Oluştur"
msgid "Create POS Opening Entry"
msgstr "POS Açılış Girişi Oluştur"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr "Ödeme Girişi Oluştur"
@@ -13603,7 +13623,7 @@ msgstr "Hesap Oluşturuluyor..."
msgid "Creating Delivery Note ..."
msgstr "İrsaliye Oluşturuluyor..."
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr "Boyutlar oluşturuluyor..."
@@ -13623,7 +13643,7 @@ msgstr "Satın Alma Faturaları Oluşturuluyor..."
msgid "Creating Purchase Order ..."
msgstr "Satın Alma Siparişi Oluşturuluyor..."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13660,11 +13680,6 @@ msgstr "{} / {} {} Oluşturuluyor"
msgid "Creation"
msgstr "Oluşturma"
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr "Oluşturulan Belge Tarihi"
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr "{1} oluşturma başarılı"
@@ -13699,11 +13714,11 @@ msgstr "{0} oluşturulması kısmen başarılı.\n"
msgid "Credit"
msgstr "Alacak"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr "Alacak (İşlem)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr "Alacak ({0})"
@@ -13846,7 +13861,7 @@ 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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr "Alacak Dekontu {0} otomatik olarak kurulmuştur"
@@ -14054,7 +14069,7 @@ msgstr "Fincan"
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14153,7 +14168,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:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr "{0} için para birimi {1} olmalıdır"
@@ -14503,6 +14518,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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14530,6 +14546,10 @@ msgstr "Müşteri / Ürün / Ürün Grubu"
msgid "Customer / Lead Address"
msgstr "Müşteri / Aday Adresi"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr ""
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14931,7 +14951,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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr "Müşteri {0} {1} projesine ait değil"
@@ -15283,7 +15303,7 @@ msgstr "Veriliş Tarihi"
msgid "Date of Joining"
msgstr "İşe Başlama Tarihi"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr "İşlem Tarihi"
@@ -15420,11 +15440,11 @@ msgstr "Sayın Sistem Yöneticisi,"
msgid "Debit"
msgstr "Borç"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr "Borç (İşlem)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr "Borç ({0})"
@@ -15498,7 +15518,7 @@ msgstr "Borçlandırma"
msgid "Debit To is required"
msgstr "Borçlandırılacak Hesap gerekli"
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr "{0} #{1} için Borç ve Alacak eşit değil. Fark {2}."
@@ -16565,7 +16585,7 @@ msgstr "Demo verileri temizlendi"
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16640,9 +16660,9 @@ msgstr "Günlük Orantılı Amortisman"
msgid "Depreciate based on shifts"
msgstr "Vardiyalara göre amortisman"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr "Amortisman Tutarı"
@@ -16698,6 +16718,14 @@ msgstr "Amortisman Kaydı"
msgid "Depreciation Entry Posting Status"
msgstr "Amortisman Girişi Gönderme Durumu"
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr ""
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16706,7 +16734,7 @@ msgstr "Amortisman Girişi Gönderme Durumu"
msgid "Depreciation Expense Account"
msgstr "Amortisman Gider Hesabı"
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr "Amortisman Gider Hesabı bir Gelir veya Gider Hesabı olmalıdır."
@@ -17592,6 +17620,10 @@ msgstr "İndirim Tarihi"
msgid "Discount Percentage"
msgstr "İndirim Yüzdesi"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr ""
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr ""
@@ -17824,7 +17856,7 @@ msgstr "Sevk Ayarları"
msgid "Disposal Date"
msgstr "Bertaraf Tarihi"
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr "Elden çıkarma tarihi {0} varlığın {1} tarihinden {2} önce olamaz."
@@ -18104,7 +18136,7 @@ msgstr "Belgeler"
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr "Her tetikleyicide işlenen belgeler. Kuyruk Boyutu 5 ile 100 arasında olmalıdır"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr "Belgeler: {0} için ertelenmiş gelir/gider etkinleştirildi. Yeniden gönderilemiyor."
@@ -19143,7 +19175,7 @@ msgstr "Boş"
msgid "Ems(Pica)"
msgstr "Pica Em"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
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."
@@ -19494,7 +19526,7 @@ msgstr "Operasyon için bir ad girin, örneğin Kesme."
msgid "Enter a name for this Holiday List."
msgstr "Bu Tatil Listesi için bir ad girin."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr "Kullanılacak tutarı giriniz."
@@ -19556,7 +19588,7 @@ msgstr "Bu Ürün Ağacından üretilecek Ürünün miktarını girin."
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr "Üretilecek miktarı girin. Hammadde Kalemleri yalnızca bu ayarlandığında getirilecektir."
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr "{0} tutarını girin."
@@ -19576,7 +19608,7 @@ msgid "Entity"
msgstr "Tüzel"
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19671,7 +19703,7 @@ msgstr "Kriter formüllerini değerlendirirken hata oluştu"
msgid "Error in party matching for Bank Transaction {0}"
msgstr "Banka İşlemi için cari eşleştirmesinde hata {0}"
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr "Amortisman girişleri kaydedilirken hata oluştu"
@@ -19723,11 +19755,9 @@ msgstr "Tahmini Süre ve Maliyet"
msgid "Evaluation Period"
msgstr "Değerlendirme Süresi"
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
-msgstr "Vergi tevkifatı uygulanan faturalar bile kontrol edilmeden kümülatif eşik ihlalinin kontrol edilmesi için dikkate alınacaktır"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
+msgstr ""
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
@@ -20089,7 +20119,7 @@ msgstr "Kullanım Ömrü Sonrası Beklenen Değer"
msgid "Expense"
msgstr "Gider"
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr "Gider / Fark hesabı ({0}) bir ‘Kar veya Zarar’ hesabı olmalıdır"
@@ -20134,7 +20164,7 @@ msgstr "Gider / Fark hesabı ({0}) bir ‘Kar veya Zarar’ hesabı olmalıdır"
msgid "Expense Account"
msgstr "Gider Hesabı"
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr "Gider Hesabı Eksik"
@@ -20441,7 +20471,7 @@ msgstr "Bozulma Tarihi"
msgid "Failure Description"
msgstr "Arıza Açıklaması"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr "Arıza: {0}"
@@ -21117,6 +21147,10 @@ msgstr "Sabit Varlık Kalemi stok dışı bir kalem olmalıdır."
msgid "Fixed Asset Register"
msgstr "Varlık Kayıt Defteri"
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21247,7 +21281,7 @@ msgstr "Varsayılan Tedarikçi (İsteğe Bağlı)"
msgid "For Item"
msgstr "Ürün için"
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr "{0} Ürünü için {2} {3} karşılığında {1} miktarından fazla alınamaz."
@@ -22139,7 +22173,7 @@ msgstr "Yaklaşan Ödeme Referansı"
msgid "Future Payments"
msgstr "Yaklaşan Ödemeler"
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr "Gelecek tarihe izin verilmiyor"
@@ -22155,7 +22189,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:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr "Genel Muhasebe Girişi"
@@ -22421,8 +22455,8 @@ 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:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22781,7 +22815,7 @@ msgstr "Gram/Litre"
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22791,7 +22825,7 @@ msgstr "Gram/Litre"
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22912,8 +22946,8 @@ msgstr "Brüt Kâr Yüzdesi"
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr "Brüt Alış Tutarı"
@@ -23264,7 +23298,7 @@ msgstr "Hektopaskal"
msgid "Height (cm)"
msgstr "Yükseklik (cm)"
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr "Merhaba,"
@@ -23303,7 +23337,7 @@ msgstr "Yardım Metni"
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr "İşletmenizde mevsimsel çalışma varsa Bütçeyi/Hedefi aylara dağıtmanıza yardımcı olur."
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr "Yukarıda bahsedilen başarısız amortisman girişleri için hata kayıtları şunlardır: {0}"
@@ -23399,7 +23433,7 @@ msgstr "Beklemede"
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr "Faturayı Beklet"
@@ -23493,6 +23527,10 @@ msgstr "Saat"
msgid "Hours Spent"
msgstr "Harcanan saat"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr ""
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23831,6 +23869,10 @@ msgstr "Sistem, bu Roldeki kullanıcılara belirli bir ürün ve depo için en s
msgid "If more than one package of the same type (for print)"
msgstr "Aynı türden birden fazla paket varsa (baskı için)"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr ""
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23847,6 +23889,10 @@ msgstr "Aksi takdirde, bu girişi İptal Edebilir veya Gönderebilirsiniz"
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr "Fiyat sıfır ise Ürün \"Ücretsiz Ürün\" olarak değerlendirilecektir"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr ""
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23929,6 +23975,10 @@ msgstr "İşaretlenirse, tek bir İş Emri için birden fazla malzeme kullanıla
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr "İşaretlenirse, Ürün Ağacı maliyeti Değerleme Oranı / Fiyat Listesi Oranı / hammaddelerin son satın alma oranına göre otomatik olarak güncellenecektir."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr "Sadakat Puanları için sınırsız son kullanma tarihi varsa, Son Kullanma Süresi alanını boş veya 0 tutun."
@@ -24023,7 +24073,7 @@ msgstr "Boş Stoku Yoksay"
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -24075,7 +24125,7 @@ msgstr "Fiyatlandırma Kuralını Yoksay etkinleştirildi. Kupon kodu uygulanam
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr "Otomatik Oluşturulan Alacak ve Borçları Yoksay"
@@ -24838,7 +24888,7 @@ msgstr "Gelen Arama Ayarları"
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24911,7 +24961,7 @@ msgstr "Geçersiz Seri ve Parti"
msgid "Incorrect Stock Value Report"
msgstr "Yanlış Stok Değeri Raporu"
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr "Yanlış İşlem Türü"
@@ -25078,13 +25128,13 @@ msgstr "Yeni Kayıt Ekle"
msgid "Inspected By"
msgstr "Kontrol Eden"
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr "Kalite Kontrol Rededildi"
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr "Kalite Kontrol Gerekli"
@@ -25101,7 +25151,7 @@ msgstr "Teslim Almadan Önce Kontrol Gerekli"
msgid "Inspection Required before Purchase"
msgstr "Satın Almadan Önce Kontrol Gerekli"
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr "Kontrol Gönderimi"
@@ -25131,7 +25181,7 @@ msgstr "Kurulum Notu"
msgid "Installation Note Item"
msgstr "Kurulum Notu Kalemi"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr "Kurulum Notu {0} zaten gönderilmiş."
@@ -25189,7 +25239,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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "Yetersiz Stok"
@@ -25380,7 +25430,7 @@ msgstr "İç Transferler"
msgid "Internal Work History"
msgstr "Firma İçindeki Geçmişi"
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr "Hesaplar arası transfer yalnızca şirketin varsayılan para biriminde yapılabilir"
@@ -25416,7 +25466,7 @@ msgid "Invalid Account"
msgstr "Geçersiz Hesap"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr "Geçersiz Tahsis Edilen Tutar"
@@ -25444,7 +25494,7 @@ msgstr "Seçilen Müşteri ve Ürün için Geçersiz Genel Sipariş"
msgid "Invalid Child Procedure"
msgstr "Geçersiz Alt Prosedür"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr "Şirketler Arası İşlem için Geçersiz Şirket."
@@ -25502,7 +25552,7 @@ msgid "Invalid Ledger Entries"
msgstr "Geçersiz Defter Girişleri"
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr "Geçersiz Açılış Girişi"
@@ -25530,7 +25580,7 @@ msgstr "Geçersiz Birincil Rol"
msgid "Invalid Priority"
msgstr "Geçersiz Öncelik"
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr "Geçersiz Proses Kaybı Yapılandırması"
@@ -25614,8 +25664,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr "{2} hesabına karşı {1} için geçersiz değer {0}"
@@ -25623,7 +25673,7 @@ msgstr "{2} hesabına karşı {1} için geçersiz değer {0}"
msgid "Invalid {0}"
msgstr "Geçersiz {0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr "Şirketler Arası İşlem için geçersiz {0}."
@@ -25833,7 +25883,7 @@ msgstr "Faturalanan Miktar"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26885,6 +26935,8 @@ msgstr "Ürün Sepeti"
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26903,7 +26955,11 @@ msgstr "Ürün Kodu"
msgid "Item Code (Final Product)"
msgstr "Bitmiş Ürün"
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr ""
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr "Seri No için Ürün Kodu değiştirilemez."
@@ -27307,6 +27363,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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28227,7 +28284,7 @@ msgstr "Hurda için Yevmiye Kaydı"
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr "Varlık amortismanı için Yevmiye Kaydı türü Amortisman Kaydı olarak ayarlanmalıdır"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr "Defter Girişi {1} için , {2} hesabı mevcut değil veya zaten başka bir giriş ile eşleştirilmiş."
@@ -28433,7 +28490,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29150,7 +29207,7 @@ msgstr "Yerel"
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29821,7 +29878,7 @@ msgstr "Zorunlu Muhasebe Boyutu"
msgid "Mandatory Depends On"
msgstr "Zorunluluk Bağlılığı"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr "Zorunlu Alan"
@@ -29911,6 +29968,7 @@ msgstr "Manuel giriş oluşturulamaz! Hesap ayarlarında ertelenmiş muhasebe i
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30469,6 +30527,7 @@ msgid "Material Requested"
msgstr "Hammadde Talep Edildi"
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr "Malzeme Talepleri"
@@ -30824,7 +30883,7 @@ msgstr "Mesaj"
msgid "Message Examples"
msgstr "Mesaj Örnekleri"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr "Mesaj Gönderildi"
@@ -31138,8 +31197,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr "Eksik Hesap"
@@ -31157,6 +31216,10 @@ 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
+msgid "Missing Filters"
+msgstr ""
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr "Kayıp Finans Kitabı"
@@ -31189,7 +31252,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:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr "Eksik Değer"
@@ -31855,7 +31918,7 @@ msgstr "Doğal gaz"
msgid "Needs Analysis"
msgstr "İhtiyaç Analizi"
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr "Negatif Parti Miktarı"
@@ -32287,7 +32350,7 @@ msgstr "Yeni Satış Siparişleri"
msgid "New Sales Person Name"
msgstr "Yeni Satış Elemanı Adı"
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr "Yeni Seri No'nun Deposu olamaz. Depo, Stok Hareketi veya Alış İrsaliyesi ile ayarlanmalıdır"
@@ -32323,7 +32386,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:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr "Yeni çıkış tarihi gelecek tarihli olmalı"
@@ -32432,7 +32495,7 @@ msgstr "Aksiyon Yok"
msgid "No Answer"
msgstr "Cevap Yok"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr "Şirketi temsil eden Şirketler Arası İşlemler için Müşteri bulunamadı {0}"
@@ -32489,9 +32552,9 @@ msgstr "Bu Cari için Ödenmemiş Fatura bulunamadı"
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"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr "İzin yok"
@@ -32526,7 +32589,7 @@ msgstr "Şu Anda Stok Mevcut Değil"
msgid "No Summary"
msgstr "Özet Yok"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr "{0} şirketini temsil eden Şirketler Arası İşlemler için Tedarikçi bulunamadı"
@@ -32624,7 +32687,7 @@ msgstr "Sepette ürün yok"
msgid "No items to be received are overdue"
msgstr "Teslim alınması gereken hiçbir ürünün vadesi geçmemiştir"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr "Otomatik mutabakat yoluyla hiçbir eşleşme oluşmadı"
@@ -32758,11 +32821,11 @@ msgstr "Bu tarihten önce hiçbir stok işlemi oluşturulamaz veya değiştirile
msgid "No values"
msgstr "Veri Yok"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr "Bu şirket için {0} Hesap bulunamadı."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr "Şirketler Arası İşlemler için {0} bulunamadı."
@@ -32797,7 +32860,7 @@ msgstr "Amortismana Tabi Olmayan Kategori"
msgid "Non Profit"
msgstr "Kâr Amacı Gütmeyen"
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr "Stok dışı ürünler"
@@ -32976,7 +33039,7 @@ msgstr ""
msgid "Note: Email will not be sent to disabled users"
msgstr "Not: Devrı dışı bırakılmış kullanıcılara e-posta gönderilmeyecektir."
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr ""
@@ -32996,7 +33059,7 @@ msgstr "Not: Bu Maliyet Merkezi bir Gruptur. Gruplara karşı muhasebe girişler
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr "Kalemleri birleştirmek istiyorsanız, eski kalem {0} için ayrı bir Stok Mutabakatı oluşturun"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr "Not: {0}"
@@ -33012,6 +33075,7 @@ msgstr "Not: {0}"
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33447,6 +33511,12 @@ msgstr "İşlemlerde sadece alt elemanlar kullanılanbilir."
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr "İş Emri {1} için yalnızca bir {0} girişi oluşturulabilir"
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr ""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33649,8 +33719,8 @@ msgstr "Açılış Borcu"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr "Birikmiş Amortisman Açılışı"
@@ -33692,7 +33762,7 @@ msgstr "Açılış Tarihi"
msgid "Opening Entry"
msgstr "Açılış Fişi"
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr "Dönem Kapanış Fişi oluşturulduktan sonra Açılış Fişi oluşturulamaz."
@@ -33720,7 +33790,7 @@ msgid "Opening Invoice Item"
msgstr "Açılış Faturası Ürünü"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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."
@@ -33794,7 +33864,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:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr "İş Emri / Ürün Ağacına Göre İşletme Maliyeti"
@@ -33950,7 +34020,7 @@ msgstr "Operasyonlar"
msgid "Operations Routing"
msgstr "Operasyonların Rotası"
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr "Operasyonlar boş bırakılamaz"
@@ -34542,7 +34612,7 @@ msgstr "Fazla Teslimat/Alınan Ürün Ödeneği (%)"
msgid "Over Picking Allowance"
msgstr "Fazla Seçim İzni"
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr "Fazla Teslim Alma"
@@ -34994,7 +35064,7 @@ msgstr "Paketli Ürün"
msgid "Packed Items"
msgstr "Paketli Ürünler"
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr "Paketlenmiş Ürünler dahili olarak transfer edilemez"
@@ -35029,7 +35099,7 @@ msgstr "Paketleme Fişi"
msgid "Packing Slip Item"
msgstr "Paketleme Fişi Kalemi"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr "Paketleme iptal edildi"
@@ -35115,7 +35185,7 @@ msgstr "Ödenmiş"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35390,7 +35460,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:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr "Kısmi Stok Rezervasyonu"
@@ -35584,9 +35654,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35747,9 +35817,9 @@ 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35914,7 +35984,7 @@ msgstr "Ödeyici Ayarları"
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -36050,7 +36120,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr "Ödeme Girişi, aldıktan sonra değiştirildi. Lütfen tekrar alın."
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr "Ödeme Girişi zaten oluşturuldu"
@@ -36259,7 +36329,7 @@ msgstr "Ödeme Referansları"
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36285,11 +36355,11 @@ msgstr "Ödeme Talebi Türü"
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr "Satış Siparişi veya Satın Alma Siparişinden oluşturulan Ödeme Talebi Taslak durumunda olacaktır. Devre dışı bırakıldığında belge kaydedilmemiş durumda olacaktır."
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr "{0}için Ödeme Talebi"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr "Ödeme Talebi zaten oluşturuldu"
@@ -36447,7 +36517,7 @@ msgstr "Ödeme URL'si"
msgid "Payment Unlink Error"
msgstr "Ödeme Bağlantısı Kaldırma Hatası"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
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"
@@ -36768,7 +36838,7 @@ msgstr "Dönem"
msgid "Period Based On"
msgstr "Döneme Göre"
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr "Dönem Kapalı"
@@ -37371,7 +37441,7 @@ msgstr "Lütfen hesabın kök bölgesindeki Şirkete ekleyin - {}"
msgid "Please add {1} role to user {0}."
msgstr "Lütfen {0} kullanıcısına {1} rolünü ekleyin."
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr "Lütfen miktarı ayarlayın veya devam etmek için {0} öğesini düzenleyin."
@@ -37379,7 +37449,7 @@ msgstr "Lütfen miktarı ayarlayın veya devam etmek için {0} öğesini düzenl
msgid "Please attach CSV file"
msgstr "Lütfen CSV dosyasını ekleyin"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr "Lütfen Ödeme Girişini iptal edin ve düzeltin"
@@ -37392,7 +37462,7 @@ msgstr "Lütfen önce ödeme girişini manuel olarak iptal edin"
msgid "Please cancel related transaction."
msgstr "Lütfen ilgili işlemi iptal edin."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr "Diğer para birimleriyle hesaplara izin vermek için lütfen Çoklu Para Birimi seçeneğini işaretleyin"
@@ -37469,7 +37539,7 @@ msgstr "Lütfen {0} ürünü için alış irsaliyesi veya alış faturası alın
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr "Lütfen {1} adresini {2} adresiyle birleştirmeden önce {0} Ürün Paketini silin"
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr ""
@@ -37593,7 +37663,7 @@ msgstr "Lütfen İlk Alış İrsaliyesini giriniz"
msgid "Please enter Receipt Document"
msgstr "Lütfen Makbuz Belgesini giriniz"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr "Lütfen Referans tarihini giriniz"
@@ -37718,8 +37788,8 @@ msgstr "Lütfen bu şirket için tüm işlemleri gerçekten silmek istediğinizd
msgid "Please mention 'Weight UOM' along with Weight."
msgstr "Lütfen Ağırlık ile birlikte 'Ağırlık Ölçü Birimini de belirtin."
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr "Lütfen Şirket: {1} için '{0}' ifadesini belirtin"
@@ -37847,7 +37917,7 @@ 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:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr "Lütfen Fiyat Listesini Seçin"
@@ -37879,7 +37949,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr "Ürün Ağacı Seçin"
@@ -37969,6 +38039,10 @@ 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
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr ""
@@ -37977,7 +38051,7 @@ msgstr ""
msgid "Please select atleast one operation to create Job Card"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr "Lütfen doğru hesabı seçin"
@@ -38058,15 +38132,15 @@ msgstr "Lütfen Önce {0} Seçin"
msgid "Please set 'Apply Additional Discount On'"
msgstr "Lütfen 'Ek İndirim Uygula' seçeneğini ayarlayın"
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr "Lütfen {0} Şirketinde 'Varlık Amortisman Masraf Merkezi' ayarlayın"
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr "Şirket {0} için ‘Varlık Elden Çıkarma Kar/Zarar Hesabı’nı ayarlayın"
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr "Lütfen Şirket: {1} için '{0}' değerini ayarlayın"
@@ -38074,7 +38148,7 @@ msgstr "Lütfen Şirket: {1} için '{0}' değerini ayarlayın"
msgid "Please set Account"
msgstr "Lütfen Hesabı Ayarlayın"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr "Lütfen Tutar Değişikliği için Hesap ayarlayın"
@@ -38100,7 +38174,7 @@ msgstr "Lütfen {} içinde Muhasebe Boyutunu {} ayarlayın"
msgid "Please set Company"
msgstr "Lütfen Şirketi ayarlayın"
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: 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"
@@ -38118,7 +38192,7 @@ msgstr "Lütfen müşteri için Mali Kodu ayarlayın '%s'"
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr "Lütfen kamu idaresi için Mali Kodu belirleyin '%s'"
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr ""
@@ -38181,7 +38255,7 @@ msgstr "Lütfen {0} Deposu için hesabı ayarlayın."
msgid "Please set an Address on the Company '%s'"
msgstr "Lütfen Şirket için bir Adres belirleyin '%s'"
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr "Lütfen Ürünler tablosunda bir Gider Hesabı ayarlayın"
@@ -38197,23 +38271,23 @@ msgstr "Lütfen Vergiler ve Ücretler Tablosunda en az bir satır ayarlayın"
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr "Lütfen {0} Şirketi için hem Vergi Kimlik Numarasını hem de Muhasebe Kodunu ayarlayın"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr "Lütfen Ödeme Şeklinde varsayılan Nakit veya Banka hesabını ayarlayın {0}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr "Lütfen Ödeme Şeklinde varsayılan Nakit veya Banka hesabını ayarlayın {}"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
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:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr "Lütfen {} Şirketi varsayılan Döviz Kazanç/Zarar Hesabını ayarlayın"
@@ -38317,7 +38391,7 @@ msgstr "Lütfen {0} alanını {1} olarak ayarlayın, bu orijinal fatura {2} içi
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr "Lütfen {1} şirketi için Hesap Türü {0} olan bir grup hesabı kurun ve etkinleştirin"
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr "Sorunu bulup çözebilmeleri için lütfen bu e-postayı destek ekibinizle paylaşın."
@@ -38330,7 +38404,7 @@ 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:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr "Lütfen devam etmek için Şirketi belirtin"
@@ -38503,6 +38577,7 @@ msgstr "Posta Giderleri"
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38537,11 +38612,11 @@ 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38560,6 +38635,7 @@ msgstr "Posta Giderleri"
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38569,6 +38645,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_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
@@ -39134,6 +39211,14 @@ msgstr "Fiyatlandırma Kuralı Ürün Kodu"
msgid "Pricing Rule Item Group"
msgstr "Fiyatlandırma Kuralı Ürün Grubu"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr ""
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr ""
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr "{0} Fiyatlandırma Kuralı güncellendi"
@@ -39192,6 +39277,10 @@ msgstr "{0} Fiyatlandırma Kuralı güncellendi"
msgid "Pricing Rules"
msgstr "Fiyatlandırma Kuralları"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr ""
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39579,7 +39668,7 @@ msgstr "Açıklama"
msgid "Process Loss"
msgstr "Proses Kaybı"
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr "Proses Kaybı Yüzdesi 100'den büyük olamaz"
@@ -40069,7 +40158,7 @@ msgstr "İlerleme (%)"
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40544,7 +40633,7 @@ msgstr "Satın Alma Verileri"
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr "Satın Alma Tarihi"
@@ -40700,7 +40789,7 @@ msgstr "Satın Alma Genel Müdürü"
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40876,9 +40965,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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41759,6 +41848,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/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
@@ -41875,7 +41965,7 @@ msgstr "Miktar {0} değerinden fazla olmamalıdır"
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr "Belirli miktarlardaki hammaddelerden üretilen veya montaj / paketleme sonrası elde edilen miktar."
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr "Satır {1} deki Ürün {0} için gereken miktar"
@@ -42724,7 +42814,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:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "Beklemeye Alma Nedeni"
@@ -43160,7 +43250,7 @@ msgstr "Karşı Kullan"
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr "Sadakat Puanı Kullan"
@@ -43292,7 +43382,7 @@ msgstr "Referans Tarihi"
msgid "Reference"
msgstr "Referans"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr "Referans #{0} tarih {1}"
@@ -43430,7 +43520,7 @@ msgstr "Referans Adı"
msgid "Reference No"
msgstr "Referans No"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr "{0} için Referans No ve Referans Tarihi gereklidir"
@@ -43438,11 +43528,11 @@ msgstr "{0} için Referans No ve Referans Tarihi gereklidir"
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr "Banka işlemi için Referans No ve Referans Tarihi zorunludur."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr "Referans Tarihi girdiyseniz Referans No zorunludur"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr "Referans No."
@@ -43556,11 +43646,11 @@ msgstr "Referans: {0}, Ürün Kodu: {1} ve Müşteri: {2}"
msgid "References"
msgstr "Referanslar"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr "Satış Faturalarına İlişkin Referanslar Eksik"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr "Satış Siparişlerine Yapılan Referanslar Eksik"
@@ -43705,8 +43795,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43725,7 +43815,7 @@ msgstr "Ayrılma Tarihi"
msgid "Remaining"
msgstr "Kalan"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr ""
@@ -43738,7 +43828,7 @@ msgstr "Kalan Bakiye"
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr "Açıklama"
@@ -43787,7 +43877,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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -44098,7 +44188,7 @@ msgstr "Ödeme Defteri Kalemlerini Yeniden Gönder"
msgid "Repost Status"
msgstr "Yeniden Gönderme Durumu"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr "Yeniden gönderme arka planda başlatıldı"
@@ -44422,7 +44512,7 @@ msgstr "Seçilen kişi kaydettikten sonra düzenlenirse, yeniden seçin."
msgid "Reseller"
msgstr "Bayi"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr "Ödeme E-postasını Yeniden Gönder"
@@ -44891,7 +44981,7 @@ msgstr "İade"
msgid "Return / Credit Note"
msgstr "İade Faturası"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr "İade Faturası"
@@ -45415,12 +45505,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: 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/sales_invoice/sales_invoice.py:1915
+#: 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"
@@ -45566,7 +45656,7 @@ msgstr "Satır #{0}: Referanslarda yinelenen giriş {1} {2}"
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr "Satır #{0}: Beklenen Teslimat Tarihi Satın Alma Siparişi Tarihinden önce olamaz"
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr "Satır #{0}: Gider Hesabı {1} Öğesi için ayarlanmadı. {2}"
@@ -45590,11 +45680,11 @@ msgstr "Satır #{0}: Bitmiş Ürün {1} olmalıdır"
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr "Satır #{0}: Hurda Ürün {1} için Bitmiş Ürün referansı zorunludur."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr "Satır #{0}: {1} için, yalnızca hesap alacaklandırılırsa referans belgesini seçebilirsiniz"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr "Satır #{0}: {1} için, yalnızca hesap alacaklandırılırsa referans belgesini seçebilirsiniz"
@@ -45614,7 +45704,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:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
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."
@@ -45650,7 +45740,7 @@ 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:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
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"
@@ -45695,15 +45785,15 @@ msgstr "Satır #{0}: Miktar pozitif bir sayı olmalıdır"
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."
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr "Satır #{0}: {1} ürünü için Kalite Kontrol gereklidir"
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr "Satır #{0}: {1} Kalite Kontrol {2} Ürünü için gönderilmemiş"
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr "Satır #{0}: {1} Kalite Kontrolü {2} Ürünü için reddedildi"
@@ -45712,7 +45802,7 @@ msgstr "Satır #{0}: {1} Kalite Kontrolü {2} Ürünü için reddedildi"
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:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
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."
@@ -45809,19 +45899,19 @@ msgstr "Satır # {0}: Fatura İndirimi {2} için durum {1} olmalı"
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
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:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
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:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
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:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
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."
@@ -45829,8 +45919,8 @@ msgstr "Satır #{0}: Stok, {2} Deposunda bulunan {1} Ürünü için ayrılmışt
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
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."
@@ -46011,7 +46101,7 @@ msgstr "Satır {0}#: Ürün {1}, {2} {3} içindeki ‘Tedarik Edilen Ham Maddele
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr "Satır {0}: Kabul Edilen Miktar ve Reddedilen Miktar aynı anda sıfır olamaz."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr "Satır {0}: Hesap {1} ve Cari Türü {2} farklı hesap türlerine sahiptir"
@@ -46019,11 +46109,11 @@ msgstr "Satır {0}: Hesap {1} ve Cari Türü {2} farklı hesap türlerine sahipt
msgid "Row {0}: Activity Type is mandatory."
msgstr "Satır {0}: Aktivite Türü zorunludur."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr "Satır {0}: Müşteriye Verilen Avans, borç olmalıdır."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr "Satır {0}: Tedarikçiye karşı avans borçlandırılmalıdır"
@@ -46043,7 +46133,7 @@ msgstr "Satır {0}: {1} etkin olduğu için, ham maddeler {2} girişine ekleneme
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr "Satır {0}: {1} Ürünü için Ürün Ağacı bulunamadı"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr "Satır {0}: Hem Borç hem de Alacak değerleri sıfır olamaz"
@@ -46059,7 +46149,7 @@ msgstr "Satır {0}: Maliyet Merkezi {1} {2} şirketine ait değil"
msgid "Row {0}: Cost center is required for an item {1}"
msgstr "Satır {0}: Bir Ürün için maliyet merkezi gereklidir {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr "Satır {0}: Alacak kaydı {1} ile ilişkilendirilemez"
@@ -46067,7 +46157,7 @@ msgstr "Satır {0}: Alacak kaydı {1} ile ilişkilendirilemez"
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr "Satır {0}: Ürün Ağacı #{1} para birimi, seçilen para birimi {2} ile aynı olmalıdır"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr "Satır {0}: Borç girişi {1} ile ilişkilendirilemez"
@@ -46083,7 +46173,7 @@ msgstr "Satır {0}: Ödeme Koşulları tablosundaki Son Tarih, Gönderim Tarihin
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr "Satır {0}: Ya İrsaliye Kalemi ya da Paketlenmiş Kalem referansı zorunludur."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "Satır {0}: Döviz Kuru zorunludur"
@@ -46117,7 +46207,7 @@ msgstr "Satır {0}: Başlangıç Saati ve Bitiş Saati zorunludur."
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr "Satır {0}: {1} için Başlangıç ve Bitiş Saatleri {2} ile çakışıyor"
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr "Satır {0}: İç transferler için Gönderen Depo zorunludur."
@@ -46129,7 +46219,7 @@ msgstr "Satır {0}: Başlangıç zamanı bitiş zamanından küçük olmalıdır
msgid "Row {0}: Hours value must be greater than zero."
msgstr "Satır {0}: Saat değeri sıfırdan büyük olmalıdır."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr "Satır {0}: Geçersiz referans {1}"
@@ -46153,7 +46243,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
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."
@@ -46161,7 +46251,7 @@ msgstr "Satır {0}: Paketlenen Miktar {1} Miktarına eşit olmalıdır."
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr "Satır {0}: {1} Kalemi için Paketleme Fişi zaten oluşturulmuştur."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr "Satır {0}: Parti / Hesap {3} {4} içindeki {1} / {2} ile eşleşmiyor"
@@ -46173,11 +46263,11 @@ msgstr "Satır {0}: Alacak / Borç hesabı {1} için Cari Türü ve Cari bilgisi
msgid "Row {0}: Payment Term is mandatory"
msgstr "Satır {0}: Ödeme Vadesi zorunludur"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr "Satır {0}: Satış/Alış Siparişine karşı yapılan ödeme her zaman avans olarak işaretlenmelidir"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr "Satır {0}: Eğer bu bir avans kaydı ise, Hesap {1} için ‘Avans’ seçeneğini işaretleyin."
@@ -46245,7 +46335,7 @@ msgstr "Satır {0}: Amortisman zaten işlenmiş olduğundan vardiya değiştiril
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr "Satır {0}: Hammadde {1} için alt yüklenici kalemi zorunludur"
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr "Satır {0}: İç transferler için Hedef Depo zorunludur."
@@ -46269,7 +46359,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:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: 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}"
@@ -46290,7 +46380,7 @@ msgstr "Satır {0}: {1} 0'dan büyük olmalıdır"
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr "Satır {0}: {1} {2} , {3} (Cari Hesabı) {4} ile aynı olamaz"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr "Satır {0}: {1} {2} {3} ile eşleşmiyor"
@@ -46683,7 +46773,7 @@ msgstr "Satış Faturası {} kullanıcısı tarafından oluşturulmadı"
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr "Satış Faturası {0} zaten kaydedildi"
@@ -46912,7 +47002,7 @@ msgstr "Satış Siparişi Durumu"
msgid "Sales Order Trends"
msgstr "Satış Trendleri"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr "Ürün için Satış Siparişi gerekli {0}"
@@ -47422,8 +47512,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47696,7 +47786,7 @@ msgstr "Hurda Malzeme Maliyeti (Şirket Para Birimi)"
msgid "Scrap Warehouse"
msgstr "Hurda Deposu"
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr "Hurdaya çıkarma tarihi satın alma tarihinden önce olamaz"
@@ -47769,7 +47859,7 @@ msgstr "Sekreter"
msgid "Section"
msgstr "Bölüm"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr "Bölüm Kodu"
@@ -48140,7 +48230,7 @@ msgstr "Müşteriyi bu alanlar ile aranabilir hale getirmek için seçin."
msgid "Selected POS Opening Entry should be open."
msgstr "Seçilen POS Açılış Girişi açık olmalıdır."
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr "Seçilen Fiyat Listesi alım satım merkezlerine sahip olmalıdır."
@@ -48324,7 +48414,7 @@ msgstr "Ek ile Gönder"
msgid "Sender"
msgstr "Gönderen"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr "Gönderiliyor"
@@ -48448,7 +48538,9 @@ msgstr "Seri ve Parti Numaraları"
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48479,7 +48571,9 @@ msgid "Serial No Count"
msgstr "Seri No Sayısı"
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr "Seri No Kayıtları"
@@ -48487,7 +48581,7 @@ msgstr "Seri No Kayıtları"
msgid "Serial No Range"
msgstr "Seri No Aralığı"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr "Seri No Ayrılmış"
@@ -48527,6 +48621,13 @@ msgstr "Seri No ve Parti"
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr "Seri / Parti Alanlarını Kullan etkinleştirildiğinde Seri No ve Parti Seçici kullanılamaz."
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr ""
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr "Seri No zorunludur"
@@ -48556,7 +48657,7 @@ msgstr "Seri No {0} {1} Ürününe ait değildir"
msgid "Serial No {0} does not exist"
msgstr "Seri No {0} mevcut değil"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr "Seri No {0} mevcut değil"
@@ -48605,7 +48706,7 @@ msgstr "Seri / Parti Numaraları"
msgid "Serial Nos and Batches"
msgstr "Seri No ve Partiler"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr "Seri Numaraları başarıyla oluşturuldu"
@@ -48683,11 +48784,11 @@ msgstr "Seri No ve Parti"
msgid "Serial and Batch Bundle"
msgstr "Seri ve Parti Paketi"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr "Seri ve Toplu Paket oluşturuldu"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr "Seri ve Toplu Paket güncellendi"
@@ -49121,7 +49222,7 @@ msgstr "Alış Faturası Fiyatına Göre İndirgenmiş Maliyeti Belirle"
msgid "Set Loyalty Program"
msgstr "Sadakat Programı Ayarla"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr "Yeni Yayın Tarihi Belirle"
@@ -49376,7 +49477,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:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49560,7 +49661,7 @@ msgstr "Sevkiyat Türü"
msgid "Shipment details"
msgstr "Sevkiyat detayları"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr "Sevkiyatlar"
@@ -49807,6 +49908,10 @@ msgstr "İptal Edilen Girişleri Göster"
msgid "Show Completed"
msgstr "Tamamlananları Göster"
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr ""
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr "Kümülatif Tutarı Göster"
@@ -49922,7 +50027,7 @@ msgstr "Önizlemeyi Göster"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr "Açıklamaları Göster"
@@ -50229,13 +50334,27 @@ msgstr "Kaynak"
msgid "Source DocType"
msgstr "Kaynak DocType"
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr ""
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr "Kaynak Belge Adı"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr ""
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr "Kaynak Belge Türü"
@@ -50306,7 +50425,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:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr "{0} satırı için Kaynak Depo zorunludur."
@@ -50817,7 +50936,7 @@ msgstr "Mahalle"
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51160,7 +51279,7 @@ msgstr "Stok Girişi {0} oluşturuldu"
msgid "Stock Entry {0} has created"
msgstr "Stok Girişi {0} oluşturuldu"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr "Stok Girişi {0} kaydedilmedi"
@@ -51383,13 +51502,13 @@ msgstr "Stok Yeniden Gönderim Ayarları"
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51398,13 +51517,13 @@ msgstr "Stok Yeniden Gönderim Ayarları"
msgid "Stock Reservation"
msgstr "Stok Rezervasyonu"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr "Stok Rezervasyon Girişleri İptal Edildi"
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr "Stok Rezervasyon Girişleri Oluşturuldu"
@@ -51426,7 +51545,7 @@ msgstr "Stok Rezervasyon Girişi teslim edildiği için güncellenemiyor."
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:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr "Rezerv Stok Depo Uyuşmazlığı"
@@ -51671,7 +51790,7 @@ 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:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr "{0} Grup Deposunda Stok Rezerve edilemez."
@@ -51687,7 +51806,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr "İş Emri {0} için ayrılmış stok iptal edildi."
@@ -52555,10 +52674,15 @@ 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "Tedarikçi"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr ""
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52671,7 +52795,7 @@ msgstr "Tedarikçi Faturası"
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr "Tedarikçi Fatura Tarihi"
@@ -52685,8 +52809,8 @@ 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "Tedarikçi Fatura No"
@@ -53233,16 +53357,16 @@ msgstr "{1} içinde {0} ürünü için tutar sıfır olduğundan, sistem fazla f
msgid "System will notify to increase or decrease quantity or amount "
msgstr "Sistem miktarını veya miktarını artırma veya azaltma bildirimi"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr "Kaynakta Tahsil Edilen Vergi Tutarı"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr "Vergi Oranı %"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr "Stopaj Vergisi Tutarı"
@@ -53259,7 +53383,7 @@ msgstr "Kesilen Stopaj Vergisi"
msgid "TDS Payable"
msgstr "Ödenecek Stopaj Vergisi"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr "Stopaj Vergisi Oranı %"
@@ -53815,7 +53939,7 @@ msgstr "Vergi Türü"
msgid "Tax Withheld Vouchers"
msgstr "Tevkifatlı Vergi Makbuzları"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr "Vergi Stopajı"
@@ -54441,7 +54565,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:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
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."
@@ -54469,7 +54593,7 @@ msgstr "Genel Muhasebe Girişleri arka planda iptal edilecektir, bu işlem birka
msgid "The Loyalty Program isn't valid for the selected company"
msgstr "Sadakat Programı seçilen şirket için geçerli değil"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr "Ödeme Talebi {0} zaten tamamlandı, ödemeyi iki kez işleme koyamazsınız."
@@ -54493,7 +54617,7 @@ msgstr "Satış Personeli {0} ile bağlantılıdır"
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr "Satır #{0}: {1} Seri Numarası, {2} deposunda mevcut değil."
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr "Seri No {0} , {1} {2} için ayrılmıştır ve başka bir işlem için kullanılamaz."
@@ -54515,7 +54639,7 @@ msgstr "Sökme Emri için İş Emri zorunludur"
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr "Kâr/Zararın kaydedileceği Yükümlülük veya Özsermaye altındaki hesap."
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr "Tahsis edilen tutar, Ödeme Talebi {0} kalan tutarından büyük."
@@ -54556,7 +54680,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:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr "{1} satırındaki {0} alanı ayarlanmamış"
@@ -54572,7 +54696,7 @@ msgstr "Folio numaraları eşleşmiyor"
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr "Aşağıdaki ürünler, Raf Yerleştirme Kurallarına (Putaway Rules) sahip olduğundan yerleştirilemedi:"
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr "Aşağıdaki varlıklar amortisman girişlerini otomatik olarak kaydedemedi: {0}"
@@ -54833,6 +54957,10 @@ msgstr ""
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr "{0} {1} , bitmiş ürün {2} adına değerleme maliyetini hesaplamak için kullanılır."
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
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."
@@ -55099,7 +55227,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr "Bu çizelge, Varlık Kapitalizasyonu {1}'un iptali üzerine Varlık {0} geri yüklendiğinde oluşturulmuştur."
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr "Bu program, Varlık {0} geri yüklendiğinde oluşturulmuştur."
@@ -55107,7 +55235,7 @@ msgstr "Bu program, Varlık {0} geri yüklendiğinde oluşturulmuştur."
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr "Bu çizelge, Varlık {0} 'ın Satış Faturası {1} aracılığıyla iade edilmesiyle oluşturuldu."
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr "Bu program, Varlık {0} hurdaya çıkarıldığında oluşturuldu."
@@ -55882,6 +56010,10 @@ msgstr "{0} nolu satırdaki verginin ürün fiyatına dahil edilebilmesi için,
msgid "To merge, following properties must be same for both items"
msgstr "Birleştirmek için, aşağıdaki özellikler her iki öğe için de aynı olmalıdır"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr "Bunu geçersiz kılmak için {1} şirketinde '{0}' ayarını etkinleştirin"
@@ -55899,7 +56031,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr "Satın alma irsaliyesi olmadan faturayı göndermek için {0} değerini {1} olarak {2} içinde ayarlayın"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
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"
@@ -56121,7 +56253,7 @@ msgstr "Toplam Tahsisler"
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56283,7 +56415,7 @@ msgstr "Toplam Kredi / Borç Tutarı, Bağlantılı Yevmiye Kaydı ile aynı olm
msgid "Total Debit"
msgstr "Toplam Borç"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr "Toplam Borç, Toplam Alacak miktarına eşit olmalıdır. Mevcut Fark {0}"
@@ -56876,6 +57008,10 @@ msgstr "Toplam"
msgid "Traceability"
msgstr "İzlenebilirlik"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr ""
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56916,7 +57052,7 @@ msgstr "İzleme Bağlantısı"
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -57014,7 +57150,7 @@ msgstr "İşlem Ayarları"
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr "İşlem Türü"
@@ -57036,7 +57172,7 @@ msgstr "İşlem Referans No: {0} Tarih: {1}"
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57633,7 +57769,11 @@ msgstr "Dağıtılmamış Tutar"
msgid "Unassigned Qty"
msgstr "Atanmamış Miktar"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr "Faturanın Engelini Kaldır"
@@ -59000,7 +59140,7 @@ msgstr ""
msgid "Vendor Invoices"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr "Tedarikçi Adı"
@@ -59067,7 +59207,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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59258,11 +59398,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59297,7 +59437,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr "Giriş Türü"
@@ -59329,9 +59469,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59350,6 +59490,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_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
@@ -59559,6 +59700,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_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
@@ -59667,7 +59809,7 @@ msgstr "Depo ve Referans"
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr "Bu depo için stok haraketi mevcut olduğundan depo silinemez."
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr "Seri No için depo değiştirilemez."
@@ -59680,7 +59822,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:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr "Stok Ürünü {0} için depo gereklidir"
@@ -59831,7 +59973,7 @@ msgstr "Eksi Stokta Uyar"
msgid "Warning!"
msgstr "Uyarı!"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr "Uyarı: Stok girişi {2} için başka bir {0} # {1} mevcut."
@@ -60314,6 +60456,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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "İş Emri"
@@ -60789,7 +60932,7 @@ msgstr "Kod listesi için veri aktarıyorsunuz:"
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr "{} İş Akışında belirlenen koşullara göre güncelleme yapmanıza izin verilmiyor."
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr "{0} tarihinden önce giriş ekleme veya güncelleme yetkiniz yok"
@@ -60821,7 +60964,7 @@ msgstr "Ayrıca, Şirket içinde genel Sermaye Devam Eden İşler hesabını da
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr "Ana hesabı Bilanço hesabına dönüştürebilir veya farklı bir hesap seçebilirsiniz."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr "'Yevmiye Kaydına Karşı' sütununa cari fiş giremezsiniz"
@@ -60838,7 +60981,7 @@ msgstr "Bu siparişte en fazla {0} puan kullanabilirsiniz."
msgid "You can only select one mode of payment as default"
msgstr "Varsayılan olarak yalnızca bir ödeme yöntemi seçebilirsiniz"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr "En çok {0} kullanabilirsiniz."
@@ -60870,11 +61013,11 @@ msgstr "Kapatılan Hesap Dönemi {1} içinde bir {0} oluşturamazsınız"
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr "Kapalı Hesap Döneminde herhangi bir muhasebe girişi oluşturamaz veya iptal edemezsiniz {0}"
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr "Bu tarihe kadar herhangi bir muhasebe kaydı oluşturamaz/değiştiremezsiniz."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr "Aynı anda aynı hesaba para yatırıp borçlandıramazsınız"
@@ -60890,7 +61033,7 @@ msgstr "Kök kategorisini düzenleyemezsiniz."
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr "{0} adetinden fazlasını kullanamazsınız."
@@ -60922,7 +61065,7 @@ msgstr "{} içindeki {} öğelerine ilişkin izniniz yok."
msgid "You don't have enough Loyalty Points to redeem"
msgstr "Kullanmak için yeterli Sadakat Puanınız yok"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr "Kullanmak için yeterli puanınız yok."
@@ -61348,7 +61491,7 @@ msgstr "Başlık"
msgid "to"
msgstr "giden"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr "bu İade Faturası tutarını iptal etmeden önce tahsisini kaldırmak için."
@@ -61388,7 +61531,7 @@ msgstr "{0}"
msgid "{0} '{1}' is disabled"
msgstr "{0} '{1}' devre dışı bırakıldı."
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr "{0} '{1}' {2} mali yılında değil."
@@ -61420,7 +61563,7 @@ msgstr "{0} Kupon kullanıldı {1}. İzin verilen miktar tükendi"
msgid "{0} Digest"
msgstr "{0} Özeti"
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr "{0} {1} sayısı zaten {2} {3} içinde kullanılıyor"
@@ -61436,7 +61579,7 @@ msgstr "{1} için {0} Talebi"
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr "{0} Numune Saklama partiye dayalıdır, lütfen Ürünün numunesini saklamak için Parti Numarası Var seçeneğini işaretleyin"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr "{0} İşlem Uzlaştırıldı"
@@ -61452,19 +61595,19 @@ msgstr "{0} hesabı {1} türünde değil"
msgid "{0} account not found while submitting purchase receipt"
msgstr "{0} Satın Alma İrsaliyesi gönderilirken hesap bulunamadı"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr "{0} {1} tarihli faturaya karşı {2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr "{0} karşılığı {1} Satın Alma Siparişi"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr "{0} Satış Faturası {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr "{0} Satış Siparişi {1}"
@@ -61472,7 +61615,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:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr "{0} ve {1}"
@@ -61531,7 +61674,7 @@ msgstr "{0} iki kere ürün vergisi girildi"
msgid "{0} entered twice {1} in Item Taxes"
msgstr "{1} Ürün Vergilerinde iki kez {0} olarak girildi"
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr "{1} için {0}"
@@ -61584,7 +61727,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr "{0} {1} Ürünü için zorunludur"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr "{0} {1} hesabı için zorunludur"
@@ -61659,7 +61802,7 @@ msgstr "{0} Ürün Üretildi"
msgid "{0} must be negative in return document"
msgstr "{0} iade faturasında negatif değer olmalıdır"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr "{0} {1} ile işlem yapmaya izin verilmiyor. Lütfen Şirketi değiştirin veya Müşteri kaydındaki 'İşlem Yapmaya İzin Verilenler' bölümüne Şirketi ekleyin."
@@ -61675,7 +61818,7 @@ msgstr "{0} parametresi geçersiz"
msgid "{0} payment entries can not be filtered by {1}"
msgstr "{0} ödeme girişleri {1} ile filtrelenemez"
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr "{1} ürününden {0} miktarı, {3} kapasiteli {2} deposuna alınmaktadır."
@@ -61736,7 +61879,7 @@ msgstr "{0} {1}"
msgid "{0} {1} Manually"
msgstr "{0} {1} Manuel olarak"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr "{0} {1} Kısmen Matubakat Sağlandı"
@@ -61801,7 +61944,7 @@ msgstr "{0} {1} iptal edilmiş veya durdurulmuş"
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr "{0} {1} iptal edildi, bu nedenle eylem tamamlanamıyor"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr "{0} {1} kapatıldı"
@@ -61813,7 +61956,7 @@ msgstr "{0} {1} devre dışı"
msgid "{0} {1} is frozen"
msgstr "{0} {1} donduruldu"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr "{0} {1} tamamen faturalandırıldı"
@@ -61825,12 +61968,12 @@ msgstr "{0} {1} etkin değil"
msgid "{0} {1} is not associated with {2} {3}"
msgstr "{0} {1} {2} {3} ile ilişkili değildir"
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr "{0} {1} herhangi bir aktif Mali Yılda değil."
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr "{0} {1} kaydedilmedi"
@@ -61842,7 +61985,7 @@ msgstr "{0} {1} beklemede"
msgid "{0} {1} must be submitted"
msgstr "{0} {1} kaydedilmelidir"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr "{0} {1} yeniden yayınlanmasına izin verilmiyor. Yeniden yayınlamayı etkinleştirmek için {2} öğesini değiştirin."
@@ -61877,7 +62020,7 @@ msgstr "{0} {1}: Hesap {2} etkin değil"
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr "{0} {1}: {2} için muhasebe kaydı yalnızca bu para birimi ile yapılabilir: {3}"
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr "{0} {1}: Maliyet Merkezi {2} öğesi için zorunludur"
@@ -61955,7 +62098,7 @@ msgstr "{doctype} {name} iptal edildi veya kapatıldı."
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr "{item_name} için Numune Boyutu ({sample_size}) Kabul Edilen Miktardan ({accepted_quantity}) büyük olamaz"
@@ -61963,7 +62106,7 @@ msgstr "{item_name} için Numune Boyutu ({sample_size}) Kabul Edilen Miktardan (
msgid "{ref_doctype} {ref_name} is {status}."
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr "{}"
@@ -62021,7 +62164,7 @@ msgstr "{} Bekliyor"
msgid "{} To Bill"
msgstr "{} Faturalanacak"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr "Kazanılan Sadakat Puanları kullanıldığından {} iptal edilemez. Önce {} No {}'yu iptal edin"
diff --git a/erpnext/locale/vi.po b/erpnext/locale/vi.po
index 213b5f2bcb8..df8d1ba312d 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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:10\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:06\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Vietnamese\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr ""
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr ""
msgid "'Default {0} Account' in Company {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr ""
@@ -840,11 +840,11 @@ msgstr ""
msgid "Your Shortcuts"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr ""
@@ -1215,10 +1215,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1523,7 +1523,7 @@ msgstr ""
msgid "Account {0}: You can not assign itself as parent account"
msgstr ""
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr ""
@@ -2012,7 +2012,7 @@ msgstr ""
msgid "Accounts Manager"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr ""
@@ -2199,7 +2199,7 @@ msgstr ""
msgid "Accounts User"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr ""
@@ -2559,6 +2559,10 @@ msgstr ""
msgid "Actual Expense"
msgstr ""
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr ""
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2696,7 +2700,7 @@ msgstr ""
msgid "Add Child"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr ""
@@ -3502,7 +3506,7 @@ msgstr ""
msgid "Advance amount cannot be greater than {0} {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr ""
@@ -3559,7 +3563,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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr ""
@@ -3628,7 +3632,7 @@ msgstr ""
msgid "Against Income Account"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr ""
@@ -3676,7 +3680,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr ""
@@ -3688,7 +3692,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr ""
@@ -3700,8 +3704,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr ""
@@ -3827,7 +3831,7 @@ msgstr ""
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr ""
@@ -3995,7 +3999,7 @@ msgstr ""
msgid "All items have already been Invoiced/Returned"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr ""
@@ -4021,7 +4025,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:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr ""
@@ -4907,7 +4911,7 @@ msgstr ""
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5047,7 +5051,7 @@ msgstr ""
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr ""
@@ -5198,7 +5202,7 @@ msgstr ""
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr ""
@@ -5781,7 +5785,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5823,7 +5827,7 @@ msgstr ""
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr ""
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr ""
@@ -5862,7 +5866,7 @@ msgstr ""
msgid "Asset Finance Book"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr ""
@@ -5938,7 +5942,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr ""
@@ -6024,9 +6028,9 @@ msgstr ""
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr ""
@@ -6055,7 +6059,7 @@ msgstr ""
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr ""
@@ -6087,7 +6091,7 @@ msgstr ""
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr ""
@@ -6099,11 +6103,11 @@ msgstr ""
msgid "Asset returned"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr ""
@@ -6128,7 +6132,7 @@ msgstr ""
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr ""
@@ -6161,7 +6165,15 @@ msgstr ""
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr ""
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr ""
@@ -6542,7 +6554,7 @@ msgstr ""
msgid "Auto Reconcile Payments"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr ""
@@ -6552,7 +6564,7 @@ msgstr ""
msgid "Auto Reconciliation Job Trigger"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr ""
@@ -6727,7 +6739,7 @@ msgstr ""
msgid "Available Batch Report"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr ""
@@ -6956,7 +6968,7 @@ msgstr ""
msgid "BOM 1"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr ""
@@ -7194,23 +7206,23 @@ msgstr ""
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr ""
@@ -7281,7 +7293,7 @@ msgstr ""
msgid "Balance (Dr - Cr)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr ""
@@ -7760,7 +7772,7 @@ msgstr ""
msgid "Base Tax Withholding Net Total"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr ""
@@ -7965,7 +7977,9 @@ msgstr ""
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -7976,7 +7990,7 @@ msgstr ""
msgid "Batch No is mandatory"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr ""
@@ -7999,7 +8013,7 @@ msgstr ""
msgid "Batch Nos"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr ""
@@ -8012,7 +8026,7 @@ msgstr ""
msgid "Batch Number Series"
msgstr ""
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr ""
@@ -8125,7 +8139,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8438,8 +8452,8 @@ msgstr ""
msgid "Blanket Order Rate"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr ""
@@ -8555,7 +8569,7 @@ msgstr ""
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr ""
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr ""
@@ -9329,7 +9343,7 @@ msgstr ""
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr ""
@@ -9515,7 +9529,7 @@ msgstr ""
msgid "Cannot Relieve Employee"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr ""
@@ -9531,6 +9545,10 @@ msgstr ""
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr ""
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr ""
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr ""
@@ -9620,7 +9638,7 @@ msgstr ""
msgid "Cannot create root account."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr ""
@@ -9637,7 +9655,7 @@ msgstr ""
msgid "Cannot delete Exchange Gain/Loss row"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr ""
@@ -10083,11 +10101,11 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr ""
@@ -10100,7 +10118,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr ""
@@ -10908,6 +10926,7 @@ msgstr ""
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11055,6 +11074,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11140,8 +11160,8 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11457,7 +11477,7 @@ msgstr ""
msgid "Company and Posting Date is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr ""
@@ -12738,7 +12758,7 @@ 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12757,7 +12777,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -12970,7 +12990,7 @@ msgstr ""
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr ""
@@ -13093,15 +13113,15 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13343,7 +13363,7 @@ msgstr ""
msgid "Create POS Opening Entry"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr ""
@@ -13499,7 +13519,7 @@ msgstr ""
msgid "Creating Delivery Note ..."
msgstr ""
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr ""
@@ -13519,7 +13539,7 @@ msgstr ""
msgid "Creating Purchase Order ..."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13556,11 +13576,6 @@ msgstr ""
msgid "Creation"
msgstr ""
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr ""
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr ""
@@ -13593,11 +13608,11 @@ msgstr ""
msgid "Credit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr ""
@@ -13740,7 +13755,7 @@ 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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr ""
@@ -13948,7 +13963,7 @@ msgstr ""
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14047,7 +14062,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr ""
@@ -14397,6 +14412,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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14424,6 +14440,10 @@ msgstr ""
msgid "Customer / Lead Address"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr ""
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14825,7 +14845,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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr ""
@@ -15177,7 +15197,7 @@ msgstr ""
msgid "Date of Joining"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr ""
@@ -15314,11 +15334,11 @@ msgstr ""
msgid "Debit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr ""
@@ -15392,7 +15412,7 @@ msgstr ""
msgid "Debit To is required"
msgstr ""
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr ""
@@ -16459,7 +16479,7 @@ msgstr ""
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16534,9 +16554,9 @@ msgstr ""
msgid "Depreciate based on shifts"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr ""
@@ -16592,6 +16612,14 @@ msgstr ""
msgid "Depreciation Entry Posting Status"
msgstr ""
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr ""
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16600,7 +16628,7 @@ msgstr ""
msgid "Depreciation Expense Account"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr ""
@@ -17486,6 +17514,10 @@ msgstr ""
msgid "Discount Percentage"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr ""
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr ""
@@ -17718,7 +17750,7 @@ msgstr ""
msgid "Disposal Date"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr ""
@@ -17998,7 +18030,7 @@ msgstr ""
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr ""
@@ -19037,7 +19069,7 @@ msgstr ""
msgid "Ems(Pica)"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr ""
@@ -19388,7 +19420,7 @@ msgstr ""
msgid "Enter a name for this Holiday List."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr ""
@@ -19449,7 +19481,7 @@ msgstr ""
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr ""
@@ -19469,7 +19501,7 @@ msgid "Entity"
msgstr ""
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19564,7 +19596,7 @@ msgstr ""
msgid "Error in party matching for Bank Transaction {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr ""
@@ -19614,10 +19646,8 @@ msgstr ""
msgid "Evaluation Period"
msgstr ""
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
msgstr ""
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
@@ -19979,7 +20009,7 @@ msgstr ""
msgid "Expense"
msgstr ""
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr ""
@@ -20024,7 +20054,7 @@ msgstr ""
msgid "Expense Account"
msgstr ""
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr ""
@@ -20331,7 +20361,7 @@ msgstr ""
msgid "Failure Description"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr ""
@@ -21007,6 +21037,10 @@ msgstr ""
msgid "Fixed Asset Register"
msgstr ""
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21137,7 +21171,7 @@ msgstr ""
msgid "For Item"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr ""
@@ -22029,7 +22063,7 @@ msgstr ""
msgid "Future Payments"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr ""
@@ -22045,7 +22079,7 @@ msgstr ""
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr ""
@@ -22311,8 +22345,8 @@ msgid "Get Items"
msgstr ""
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22671,7 +22705,7 @@ msgstr ""
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22681,7 +22715,7 @@ msgstr ""
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22802,8 +22836,8 @@ msgstr ""
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr ""
@@ -23154,7 +23188,7 @@ msgstr ""
msgid "Height (cm)"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr ""
@@ -23193,7 +23227,7 @@ msgstr ""
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr ""
@@ -23289,7 +23323,7 @@ msgstr ""
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr ""
@@ -23383,6 +23417,10 @@ msgstr ""
msgid "Hours Spent"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr ""
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23719,6 +23757,10 @@ msgstr ""
msgid "If more than one package of the same type (for print)"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr ""
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23735,6 +23777,10 @@ msgstr ""
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr ""
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23817,6 +23863,10 @@ msgstr ""
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr ""
@@ -23911,7 +23961,7 @@ msgstr ""
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -23963,7 +24013,7 @@ msgstr ""
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr ""
@@ -24726,7 +24776,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24799,7 +24849,7 @@ msgstr ""
msgid "Incorrect Stock Value Report"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr ""
@@ -24966,13 +25016,13 @@ msgstr ""
msgid "Inspected By"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr ""
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr ""
@@ -24989,7 +25039,7 @@ msgstr ""
msgid "Inspection Required before Purchase"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr ""
@@ -25019,7 +25069,7 @@ msgstr ""
msgid "Installation Note Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr ""
@@ -25077,7 +25127,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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr ""
@@ -25268,7 +25318,7 @@ msgstr ""
msgid "Internal Work History"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr ""
@@ -25304,7 +25354,7 @@ msgid "Invalid Account"
msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr ""
@@ -25332,7 +25382,7 @@ msgstr ""
msgid "Invalid Child Procedure"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr ""
@@ -25390,7 +25440,7 @@ msgid "Invalid Ledger Entries"
msgstr ""
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr ""
@@ -25418,7 +25468,7 @@ msgstr ""
msgid "Invalid Priority"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr ""
@@ -25502,8 +25552,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr ""
@@ -25511,7 +25561,7 @@ msgstr ""
msgid "Invalid {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr ""
@@ -25721,7 +25771,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26773,6 +26823,8 @@ msgstr ""
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26791,7 +26843,11 @@ msgstr ""
msgid "Item Code (Final Product)"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr ""
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr ""
@@ -27195,6 +27251,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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28115,7 +28172,7 @@ msgstr ""
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr ""
@@ -28321,7 +28378,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29037,7 +29094,7 @@ msgstr ""
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29708,7 +29765,7 @@ msgstr ""
msgid "Mandatory Depends On"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr ""
@@ -29798,6 +29855,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30356,6 +30414,7 @@ msgid "Material Requested"
msgstr ""
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr ""
@@ -30711,7 +30770,7 @@ msgstr ""
msgid "Message Examples"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr ""
@@ -31025,8 +31084,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr ""
@@ -31044,6 +31103,10 @@ msgstr ""
msgid "Missing Default in Company"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr ""
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr ""
@@ -31076,7 +31139,7 @@ msgstr ""
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr ""
@@ -31742,7 +31805,7 @@ msgstr ""
msgid "Needs Analysis"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr ""
@@ -32174,7 +32237,7 @@ msgstr ""
msgid "New Sales Person Name"
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr ""
@@ -32210,7 +32273,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:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr ""
@@ -32319,7 +32382,7 @@ msgstr ""
msgid "No Answer"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr ""
@@ -32376,9 +32439,9 @@ msgstr ""
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr ""
@@ -32413,7 +32476,7 @@ msgstr ""
msgid "No Summary"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr ""
@@ -32511,7 +32574,7 @@ msgstr ""
msgid "No items to be received are overdue"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr ""
@@ -32645,11 +32708,11 @@ msgstr ""
msgid "No values"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr ""
@@ -32684,7 +32747,7 @@ msgstr ""
msgid "Non Profit"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr ""
@@ -32863,7 +32926,7 @@ msgstr ""
msgid "Note: Email will not be sent to disabled users"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr ""
@@ -32883,7 +32946,7 @@ msgstr ""
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr ""
@@ -32899,6 +32962,7 @@ msgstr ""
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33334,6 +33398,12 @@ msgstr ""
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr ""
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr ""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33535,8 +33605,8 @@ msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr ""
@@ -33578,7 +33648,7 @@ msgstr ""
msgid "Opening Entry"
msgstr ""
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr ""
@@ -33606,7 +33676,7 @@ msgid "Opening Invoice Item"
msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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 ""
@@ -33680,7 +33750,7 @@ msgstr ""
msgid "Operating Cost Per BOM Quantity"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr ""
@@ -33836,7 +33906,7 @@ msgstr ""
msgid "Operations Routing"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr ""
@@ -34428,7 +34498,7 @@ msgstr ""
msgid "Over Picking Allowance"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr ""
@@ -34880,7 +34950,7 @@ msgstr ""
msgid "Packed Items"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr ""
@@ -34915,7 +34985,7 @@ msgstr ""
msgid "Packing Slip Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr ""
@@ -35001,7 +35071,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35276,7 +35346,7 @@ msgstr ""
msgid "Partial Payment in POS Transactions are not allowed."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr ""
@@ -35470,9 +35540,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35633,9 +35703,9 @@ 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35800,7 +35870,7 @@ msgstr ""
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -35936,7 +36006,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr ""
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr ""
@@ -36145,7 +36215,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36171,11 +36241,11 @@ msgstr ""
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr ""
@@ -36333,7 +36403,7 @@ msgstr ""
msgid "Payment Unlink Error"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr ""
@@ -36654,7 +36724,7 @@ msgstr ""
msgid "Period Based On"
msgstr ""
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr ""
@@ -37257,7 +37327,7 @@ msgstr ""
msgid "Please add {1} role to user {0}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr ""
@@ -37265,7 +37335,7 @@ msgstr ""
msgid "Please attach CSV file"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr ""
@@ -37278,7 +37348,7 @@ msgstr ""
msgid "Please cancel related transaction."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr ""
@@ -37355,7 +37425,7 @@ msgstr ""
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr ""
@@ -37479,7 +37549,7 @@ msgstr ""
msgid "Please enter Receipt Document"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr ""
@@ -37604,8 +37674,8 @@ msgstr ""
msgid "Please mention 'Weight UOM' along with Weight."
msgstr ""
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr ""
@@ -37733,7 +37803,7 @@ msgstr ""
msgid "Please select Posting Date first"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr ""
@@ -37765,7 +37835,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr ""
@@ -37855,6 +37925,10 @@ 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
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr ""
@@ -37863,7 +37937,7 @@ msgstr ""
msgid "Please select atleast one operation to create Job Card"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr ""
@@ -37944,15 +38018,15 @@ msgstr ""
msgid "Please set 'Apply Additional Discount On'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr ""
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr ""
@@ -37960,7 +38034,7 @@ msgstr ""
msgid "Please set Account"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr ""
@@ -37986,7 +38060,7 @@ msgstr ""
msgid "Please set Company"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr ""
@@ -38004,7 +38078,7 @@ msgstr ""
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr ""
@@ -38067,7 +38141,7 @@ msgstr ""
msgid "Please set an Address on the Company '%s'"
msgstr ""
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr ""
@@ -38083,23 +38157,23 @@ msgstr ""
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr ""
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr ""
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr ""
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr ""
@@ -38203,7 +38277,7 @@ msgstr ""
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr ""
@@ -38216,7 +38290,7 @@ msgid "Please specify Company"
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr ""
@@ -38389,6 +38463,7 @@ msgstr ""
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38423,11 +38498,11 @@ 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38446,6 +38521,7 @@ msgstr ""
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38455,6 +38531,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_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
@@ -39020,6 +39097,14 @@ msgstr ""
msgid "Pricing Rule Item Group"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr ""
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr ""
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr ""
@@ -39078,6 +39163,10 @@ msgstr ""
msgid "Pricing Rules"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr ""
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39465,7 +39554,7 @@ msgstr ""
msgid "Process Loss"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr ""
@@ -39955,7 +40044,7 @@ msgstr ""
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40430,7 +40519,7 @@ msgstr ""
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr ""
@@ -40586,7 +40675,7 @@ msgstr ""
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40762,9 +40851,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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41645,6 +41734,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/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
@@ -41761,7 +41851,7 @@ msgstr ""
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr ""
@@ -42610,7 +42700,7 @@ msgid "Reason"
msgstr ""
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr ""
@@ -43046,7 +43136,7 @@ msgstr ""
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr ""
@@ -43178,7 +43268,7 @@ msgstr ""
msgid "Reference"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr ""
@@ -43316,7 +43406,7 @@ msgstr ""
msgid "Reference No"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr ""
@@ -43324,11 +43414,11 @@ msgstr ""
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr ""
@@ -43442,11 +43532,11 @@ msgstr ""
msgid "References"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr ""
@@ -43591,8 +43681,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43611,7 +43701,7 @@ msgstr ""
msgid "Remaining"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr ""
@@ -43624,7 +43714,7 @@ msgstr ""
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr ""
@@ -43673,7 +43763,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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -43984,7 +44074,7 @@ msgstr ""
msgid "Repost Status"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr ""
@@ -44308,7 +44398,7 @@ msgstr ""
msgid "Reseller"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr ""
@@ -44777,7 +44867,7 @@ msgstr ""
msgid "Return / Credit Note"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr ""
@@ -45301,12 +45391,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: 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/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr ""
@@ -45452,7 +45542,7 @@ msgstr ""
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr ""
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr ""
@@ -45476,11 +45566,11 @@ msgstr ""
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr ""
@@ -45500,7 +45590,7 @@ msgstr ""
msgid "Row #{0}: Item {1} does not exist"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr ""
@@ -45536,7 +45626,7 @@ 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:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr ""
@@ -45581,15 +45671,15 @@ msgstr ""
msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr ""
@@ -45598,7 +45688,7 @@ msgstr ""
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr ""
@@ -45692,19 +45782,19 @@ msgstr ""
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr ""
@@ -45712,8 +45802,8 @@ msgstr ""
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr ""
@@ -45894,7 +45984,7 @@ msgstr ""
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr ""
@@ -45902,11 +45992,11 @@ msgstr ""
msgid "Row {0}: Activity Type is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr ""
@@ -45926,7 +46016,7 @@ msgstr ""
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr ""
@@ -45942,7 +46032,7 @@ msgstr ""
msgid "Row {0}: Cost center is required for an item {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr ""
@@ -45950,7 +46040,7 @@ msgstr ""
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr ""
@@ -45966,7 +46056,7 @@ msgstr ""
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr ""
@@ -46000,7 +46090,7 @@ msgstr ""
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46012,7 +46102,7 @@ msgstr ""
msgid "Row {0}: Hours value must be greater than zero."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr ""
@@ -46036,7 +46126,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr ""
@@ -46044,7 +46134,7 @@ msgstr ""
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr ""
@@ -46056,11 +46146,11 @@ msgstr ""
msgid "Row {0}: Payment Term is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr ""
@@ -46128,7 +46218,7 @@ msgstr ""
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr ""
@@ -46152,7 +46242,7 @@ msgstr ""
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr ""
@@ -46173,7 +46263,7 @@ msgstr ""
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr ""
@@ -46566,7 +46656,7 @@ msgstr ""
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr ""
@@ -46795,7 +46885,7 @@ msgstr ""
msgid "Sales Order Trends"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr ""
@@ -47305,8 +47395,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47577,7 +47667,7 @@ msgstr ""
msgid "Scrap Warehouse"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr ""
@@ -47650,7 +47740,7 @@ msgstr ""
msgid "Section"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr ""
@@ -48020,7 +48110,7 @@ msgstr ""
msgid "Selected POS Opening Entry should be open."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr ""
@@ -48204,7 +48294,7 @@ msgstr ""
msgid "Sender"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr ""
@@ -48328,7 +48418,9 @@ msgstr ""
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48359,7 +48451,9 @@ msgid "Serial No Count"
msgstr ""
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr ""
@@ -48367,7 +48461,7 @@ msgstr ""
msgid "Serial No Range"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr ""
@@ -48407,6 +48501,13 @@ msgstr ""
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr ""
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr ""
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr ""
@@ -48436,7 +48537,7 @@ msgstr ""
msgid "Serial No {0} does not exist"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr ""
@@ -48485,7 +48586,7 @@ msgstr ""
msgid "Serial Nos and Batches"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr ""
@@ -48563,11 +48664,11 @@ msgstr ""
msgid "Serial and Batch Bundle"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr ""
@@ -49001,7 +49102,7 @@ msgstr ""
msgid "Set Loyalty Program"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr ""
@@ -49256,7 +49357,7 @@ msgstr ""
msgid "Setting up company"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49440,7 +49541,7 @@ msgstr ""
msgid "Shipment details"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr ""
@@ -49687,6 +49788,10 @@ msgstr ""
msgid "Show Completed"
msgstr ""
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr ""
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr ""
@@ -49802,7 +49907,7 @@ msgstr ""
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr ""
@@ -50107,13 +50212,27 @@ msgstr ""
msgid "Source DocType"
msgstr ""
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr ""
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr ""
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr ""
@@ -50184,7 +50303,7 @@ msgstr ""
msgid "Source Warehouse Address Link"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr ""
@@ -50695,7 +50814,7 @@ msgstr ""
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51038,7 +51157,7 @@ msgstr ""
msgid "Stock Entry {0} has created"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr ""
@@ -51261,13 +51380,13 @@ msgstr ""
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51276,13 +51395,13 @@ msgstr ""
msgid "Stock Reservation"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr ""
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr ""
@@ -51304,7 +51423,7 @@ msgstr ""
msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr ""
@@ -51549,7 +51668,7 @@ msgstr ""
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr ""
@@ -51565,7 +51684,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr ""
@@ -52433,10 +52552,15 @@ 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr ""
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52549,7 +52673,7 @@ msgstr ""
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr ""
@@ -52563,8 +52687,8 @@ 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr ""
@@ -53111,16 +53235,16 @@ msgstr ""
msgid "System will notify to increase or decrease quantity or amount "
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr ""
@@ -53137,7 +53261,7 @@ msgstr ""
msgid "TDS Payable"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr ""
@@ -53693,7 +53817,7 @@ msgstr ""
msgid "Tax Withheld Vouchers"
msgstr ""
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr ""
@@ -54318,7 +54442,7 @@ msgstr ""
msgid "The BOM which will be replaced"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr ""
@@ -54346,7 +54470,7 @@ msgstr ""
msgid "The Loyalty Program isn't valid for the selected company"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr ""
@@ -54370,7 +54494,7 @@ msgstr ""
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr ""
@@ -54392,7 +54516,7 @@ msgstr ""
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr ""
@@ -54433,7 +54557,7 @@ msgstr ""
msgid "The field To Shareholder cannot be blank"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr ""
@@ -54449,7 +54573,7 @@ msgstr ""
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr ""
@@ -54710,6 +54834,10 @@ msgstr ""
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr ""
@@ -54976,7 +55104,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr ""
@@ -54984,7 +55112,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr ""
@@ -55759,6 +55887,10 @@ msgstr ""
msgid "To merge, following properties must be same for both items"
msgstr ""
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr ""
@@ -55776,7 +55908,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr ""
@@ -55998,7 +56130,7 @@ msgstr ""
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56160,7 +56292,7 @@ msgstr ""
msgid "Total Debit"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr ""
@@ -56753,6 +56885,10 @@ msgstr ""
msgid "Traceability"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr ""
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56793,7 +56929,7 @@ msgstr ""
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -56891,7 +57027,7 @@ msgstr ""
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr ""
@@ -56913,7 +57049,7 @@ msgstr ""
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57510,7 +57646,11 @@ msgstr ""
msgid "Unassigned Qty"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr ""
@@ -58877,7 +59017,7 @@ msgstr ""
msgid "Vendor Invoices"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr ""
@@ -58944,7 +59084,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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59135,11 +59275,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59174,7 +59314,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr ""
@@ -59206,9 +59346,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59227,6 +59367,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_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
@@ -59436,6 +59577,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_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
@@ -59544,7 +59686,7 @@ msgstr ""
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr ""
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr ""
@@ -59557,7 +59699,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:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr ""
@@ -59708,7 +59850,7 @@ msgstr ""
msgid "Warning!"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr ""
@@ -60191,6 +60333,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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr ""
@@ -60666,7 +60809,7 @@ msgstr ""
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr ""
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr ""
@@ -60698,7 +60841,7 @@ msgstr ""
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr ""
@@ -60715,7 +60858,7 @@ msgstr ""
msgid "You can only select one mode of payment as default"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr ""
@@ -60747,11 +60890,11 @@ msgstr ""
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr ""
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr ""
@@ -60767,7 +60910,7 @@ msgstr ""
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr ""
@@ -60799,7 +60942,7 @@ msgstr ""
msgid "You don't have enough Loyalty Points to redeem"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr ""
@@ -61225,7 +61368,7 @@ msgstr ""
msgid "to"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr ""
@@ -61265,7 +61408,7 @@ msgstr ""
msgid "{0} '{1}' is disabled"
msgstr ""
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr ""
@@ -61297,7 +61440,7 @@ msgstr ""
msgid "{0} Digest"
msgstr ""
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr ""
@@ -61313,7 +61456,7 @@ msgstr ""
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr ""
@@ -61329,19 +61472,19 @@ msgstr ""
msgid "{0} account not found while submitting purchase receipt"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr ""
@@ -61349,7 +61492,7 @@ msgstr ""
msgid "{0} already has a Parent Procedure {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr ""
@@ -61408,7 +61551,7 @@ msgstr ""
msgid "{0} entered twice {1} in Item Taxes"
msgstr ""
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr ""
@@ -61461,7 +61604,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr ""
@@ -61536,7 +61679,7 @@ msgstr ""
msgid "{0} must be negative in return document"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr ""
@@ -61552,7 +61695,7 @@ msgstr ""
msgid "{0} payment entries can not be filtered by {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr ""
@@ -61613,7 +61756,7 @@ msgstr ""
msgid "{0} {1} Manually"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr ""
@@ -61678,7 +61821,7 @@ msgstr ""
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr ""
@@ -61690,7 +61833,7 @@ msgstr ""
msgid "{0} {1} is frozen"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr ""
@@ -61702,12 +61845,12 @@ msgstr ""
msgid "{0} {1} is not associated with {2} {3}"
msgstr ""
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr ""
@@ -61719,7 +61862,7 @@ msgstr ""
msgid "{0} {1} must be submitted"
msgstr ""
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr ""
@@ -61754,7 +61897,7 @@ msgstr ""
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr ""
@@ -61832,7 +61975,7 @@ msgstr ""
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr ""
@@ -61840,7 +61983,7 @@ msgstr ""
msgid "{ref_doctype} {ref_name} is {status}."
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr ""
@@ -61898,7 +62041,7 @@ msgstr ""
msgid "{} To Bill"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr ""
diff --git a/erpnext/locale/zh.po b/erpnext/locale/zh.po
index 35b265e78de..fd5a1b37a93 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-03 09:38+0000\n"
-"PO-Revision-Date: 2025-08-03 15:10\n"
+"POT-Creation-Date: 2025-08-10 09:37+0000\n"
+"PO-Revision-Date: 2025-08-11 17:06\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Chinese Simplified\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid " Item"
msgstr "物料"
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107
#: erpnext/selling/report/sales_analytics/sales_analytics.py:128
msgid " Name"
@@ -244,7 +244,7 @@ msgstr "“ 最后的订单到目前的天数”必须大于或等于零"
msgid "'Default {0} Account' in Company {1}"
msgstr "公司{1}的'默认{0}科目'"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273
msgid "'Entries' cannot be empty"
msgstr "“分录”不能为空"
@@ -915,11 +915,11 @@ msgstr "快速访问\n"
msgid "Your Shortcuts"
msgstr "快速访问"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:984
+#: erpnext/accounts/doctype/payment_request/payment_request.py:985
msgid "Grand Total: {0}"
msgstr "总计： {0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:985
+#: erpnext/accounts/doctype/payment_request/payment_request.py:986
msgid "Outstanding Amount: {0}"
msgstr "未清金额： {0}"
@@ -1315,10 +1315,10 @@ 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:640
+#: erpnext/accounts/report/general_ledger/general_ledger.py:652
#: 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:146
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
#: erpnext/accounts/report/trial_balance/trial_balance.py:436
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -1623,7 +1623,7 @@ msgstr "科目{0}的上级科目{1}不存在"
msgid "Account {0}: You can not assign itself as parent account"
msgstr "科目{0}不能是自己的上级科目"
-#: erpnext/accounts/general_ledger.py:437
+#: erpnext/accounts/general_ledger.py:451
msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry"
msgstr "{0}是在建工程科目，不能通过日记账凭证更新"
@@ -2112,7 +2112,7 @@ msgstr "冻结记账截止日"
msgid "Accounts Manager"
msgstr "会计经理"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348
msgid "Accounts Missing Error"
msgstr "科目缺失错误"
@@ -2299,7 +2299,7 @@ msgstr "会计设置"
msgid "Accounts User"
msgstr "会计"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372
msgid "Accounts table cannot be blank."
msgstr "科目表不能为空。"
@@ -2659,6 +2659,10 @@ msgstr "实际结束时间"
msgid "Actual Expense"
msgstr "实际费用"
+#: erpnext/accounts/doctype/budget/budget.py:319
+msgid "Actual Expenses"
+msgstr ""
+
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order'
#. Label of the actual_operating_cost (Currency) field in DocType 'Work Order
#. Operation'
@@ -2796,7 +2800,7 @@ msgstr "添加/编辑价格"
msgid "Add Child"
msgstr "添加子项"
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:207
msgid "Add Columns in Transaction Currency"
msgstr "显示交易货币金额"
@@ -3602,7 +3606,7 @@ msgstr "预付金额"
msgid "Advance amount cannot be greater than {0} {1}"
msgstr "预付金额不能大于{0} {1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:926
msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
msgstr "{0}{1}对应的预付款金额不可超过总计{2}"
@@ -3659,7 +3663,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:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:721
msgid "Against Account"
msgstr "对方科目"
@@ -3728,7 +3732,7 @@ msgstr "费用账目"
msgid "Against Income Account"
msgstr "收入账目"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr "日记账凭证{0}没有不符合的{1}分录"
@@ -3776,7 +3780,7 @@ 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:729
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Voucher"
msgstr "对销凭证"
@@ -3788,7 +3792,7 @@ msgstr "对销凭证"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:57
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:71
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:186
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:192
msgid "Against Voucher No"
msgstr "对销凭证号"
@@ -3800,8 +3804,8 @@ 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:727
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
+#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr "对销凭证类型"
@@ -3927,7 +3931,7 @@ msgstr "全部"
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184
+#: erpnext/accounts/utils.py:1451 erpnext/public/js/setup_wizard.js:184
msgid "All Accounts"
msgstr "所有科目"
@@ -4095,7 +4099,7 @@ msgstr "所有物料已申请"
msgid "All items have already been Invoiced/Returned"
msgstr "所有物料已开具发票/退回"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
msgid "All items have already been received"
msgstr "所有物料已收货"
@@ -4121,7 +4125,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:841
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
msgid "All these items have already been Invoiced/Returned"
msgstr "所有物料已经开票/被退货"
@@ -5007,7 +5011,7 @@ msgstr "修订自(上一版单据编号)"
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:331
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:195
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:201
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44
#: erpnext/accounts/report/share_balance/share_balance.py:61
@@ -5147,7 +5151,7 @@ msgstr "量图"
#. Label of the amount_in_account_currency (Currency) field in DocType 'Payment
#. Ledger Entry'
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:206
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:212
msgid "Amount in Account Currency"
msgstr "金额(科目货币)"
@@ -5298,7 +5302,7 @@ msgstr "对于财年{4}，{1}'{2}'和科目“{3}”已存在另一个
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr "成本中心分配记录{0}自{1}生效，当前分配有效期至{2}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:741
+#: erpnext/accounts/doctype/payment_request/payment_request.py:742
msgid "Another Payment Request is already processed"
msgstr "已有其他付款请求正在处理"
@@ -5881,7 +5885,7 @@ msgstr "资产资本化库存物料"
#: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:419
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:483
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -5923,7 +5927,7 @@ msgstr "固定资产折旧计划"
msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
msgstr "资产{0}与财务账簿{1}的折旧计划未采用班次折旧法"
-#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:224
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:247
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:185
msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
msgstr "未找到资产{0}与财务账簿{1}的折旧计划"
@@ -5962,7 +5966,7 @@ msgstr "资产处置"
msgid "Asset Finance Book"
msgstr "账簿"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:411
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
msgid "Asset ID"
msgstr "资产编号"
@@ -6038,7 +6042,7 @@ msgstr "资产变动{0}已创建"
#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#: erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
#: erpnext/assets/doctype/asset_repair/asset_repair.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:417
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:481
msgid "Asset Name"
msgstr "资产名称"
@@ -6124,9 +6128,9 @@ msgstr "资产状态"
#: erpnext/assets/dashboard_fixtures.py:175
#: erpnext/assets/doctype/asset/asset.js:421
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:394
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:441
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:209
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:458
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:505
msgid "Asset Value"
msgstr "资产价值"
@@ -6155,7 +6159,7 @@ msgstr "资产已取消"
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "资产不能被取消，因为它已经是{0}"
-#: erpnext/assets/doctype/asset/depreciation.py:387
+#: erpnext/assets/doctype/asset/depreciation.py:389
msgid "Asset cannot be scrapped before the last depreciation entry."
msgstr "在最后折旧分录前不能报废资产"
@@ -6187,7 +6191,7 @@ msgstr "资产因维修{0}处于停用状态"
msgid "Asset received at Location {0} and issued to Employee {1}"
msgstr "资产在位置{0}接收并发放给员工{1}"
-#: erpnext/assets/doctype/asset/depreciation.py:448
+#: erpnext/assets/doctype/asset/depreciation.py:450
msgid "Asset restored"
msgstr "资产已恢复"
@@ -6199,11 +6203,11 @@ msgstr "因取消资产资本化{0} 恢复了资产价值"
msgid "Asset returned"
msgstr "资产已归还"
-#: erpnext/assets/doctype/asset/depreciation.py:435
+#: erpnext/assets/doctype/asset/depreciation.py:437
msgid "Asset scrapped"
msgstr "资产已报废"
-#: erpnext/assets/doctype/asset/depreciation.py:437
+#: erpnext/assets/doctype/asset/depreciation.py:439
msgid "Asset scrapped via Journal Entry {0}"
msgstr "通过资产日记账凭证报废{0}"
@@ -6228,7 +6232,7 @@ msgstr "资产拆分更新为资产{0}"
msgid "Asset updated due to Asset Repair {0} {1}."
msgstr "资产因维修单{0}{1}已更新。"
-#: erpnext/assets/doctype/asset/depreciation.py:369
+#: erpnext/assets/doctype/asset/depreciation.py:371
msgid "Asset {0} cannot be scrapped, as it is already {1}"
msgstr "因为已经{1}，资产{0}不能报废，"
@@ -6261,7 +6265,15 @@ msgstr "资产 {0} 已变更，如需折旧请设置折旧信息后提交资产"
msgid "Asset {0} is in {1} status and cannot be repaired."
msgstr ""
-#: erpnext/assets/doctype/asset/depreciation.py:367
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:96
+msgid "Asset {0} is not set to calculate depreciation."
+msgstr ""
+
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:102
+msgid "Asset {0} is not submitted. Please submit the asset before proceeding."
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:369
msgid "Asset {0} must be submitted"
msgstr "资产{0}必须提交"
@@ -6642,7 +6654,7 @@ msgstr "自动核销"
msgid "Auto Reconcile Payments"
msgstr "启用自动核销收付款"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:443
msgid "Auto Reconciliation"
msgstr "自动核销"
@@ -6652,7 +6664,7 @@ msgstr "自动核销"
msgid "Auto Reconciliation Job Trigger"
msgstr "自动核销后台任务触发间隔"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:390
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
msgid "Auto Reconciliation has started in the background"
msgstr "后台已启动自动对账"
@@ -6827,7 +6839,7 @@ msgstr "仓库内可用批号数量"
msgid "Available Batch Report"
msgstr "批号数量报表"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:428
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:492
msgid "Available For Use Date"
msgstr "可用日期"
@@ -7056,7 +7068,7 @@ msgstr "物料清单"
msgid "BOM 1"
msgstr "物料清单1"
-#: erpnext/manufacturing/doctype/bom/bom.py:1508
+#: erpnext/manufacturing/doctype/bom/bom.py:1519
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "物料清单1 {0} 与物料清单2 {0} 不能相同"
@@ -7294,23 +7306,23 @@ msgstr "BOM不包含任何库存物料"
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr "物料清单嵌套： {0} 不能是 {1} 的下层"
-#: erpnext/manufacturing/doctype/bom/bom.py:666
+#: erpnext/manufacturing/doctype/bom/bom.py:677
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr "物料清单递归错误：{1}不能作为{0}的父项或子项"
-#: erpnext/manufacturing/doctype/bom/bom.py:1321
+#: erpnext/manufacturing/doctype/bom/bom.py:1332
msgid "BOM {0} does not belong to Item {1}"
msgstr "BOM{0}不属于物料{1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1303
+#: erpnext/manufacturing/doctype/bom/bom.py:1314
msgid "BOM {0} must be active"
msgstr "BOM{0}必须处于生效状态"
-#: erpnext/manufacturing/doctype/bom/bom.py:1306
+#: erpnext/manufacturing/doctype/bom/bom.py:1317
msgid "BOM {0} must be submitted"
msgstr "BOM{0}未提交"
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:734
msgid "BOM {0} not found for the item {1}"
msgstr "未找到物料{1}的物料清单{0}"
@@ -7381,7 +7393,7 @@ msgstr "余额"
msgid "Balance (Dr - Cr)"
msgstr "结余（Dr - Cr）"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:661
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
msgid "Balance ({0})"
msgstr "余额（{0}）"
@@ -7860,7 +7872,7 @@ msgstr "基准汇率"
msgid "Base Tax Withholding Net Total"
msgstr "基准代扣税净总计"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
msgid "Base Total"
msgstr "基准总额"
@@ -8065,7 +8077,9 @@ msgstr "物料批号到期状态"
#: erpnext/stock/report/available_batch_report/available_batch_report.py:51
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68
#: 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:152
+#: 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/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
@@ -8076,7 +8090,7 @@ msgstr "批号"
msgid "Batch No is mandatory"
msgstr "批次号为必填项"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2717
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2728
msgid "Batch No {0} does not exists"
msgstr "批次号{0}不存在"
@@ -8099,7 +8113,7 @@ msgstr "批次号"
msgid "Batch Nos"
msgstr "批号"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1481
msgid "Batch Nos are created successfully"
msgstr "已成功创建批号"
@@ -8112,7 +8126,7 @@ msgstr "批次不可退回"
msgid "Batch Number Series"
msgstr "批号模板"
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:153
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
msgid "Batch Qty"
msgstr "批号数量"
@@ -8225,7 +8239,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:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1188
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8538,8 +8552,8 @@ msgstr "框架订单明细"
msgid "Blanket Order Rate"
msgstr "框架订单单价"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:113
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:259
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
msgid "Block Invoice"
msgstr "冻结发票"
@@ -8655,7 +8669,7 @@ msgstr "已入账固定资产"
msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
msgstr "跨多个账户记录库存价值会使跟踪库存和账户价值更困难"
-#: erpnext/accounts/general_ledger.py:786
+#: erpnext/accounts/general_ledger.py:800
msgid "Books have been closed till the period ending on {0}"
msgstr "截止到 {0} 的会计记账已关闭"
@@ -9429,7 +9443,7 @@ msgstr "若按付款方式分组，则无法按付款方式筛选"
msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr "按凭证分类后不能根据凭证号过滤"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940
msgid "Can only make payment against unbilled {0}"
msgstr "只能为未开票{0}付款"
@@ -9615,7 +9629,7 @@ msgstr "无司机地址，无法优化配送路线"
msgid "Cannot Relieve Employee"
msgstr "无法解除员工"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:72
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:73
msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year."
msgstr "不允许在已关闭财年更新会计凭证"
@@ -9631,6 +9645,10 @@ msgstr "单笔凭证不能为多方应用源头减税"
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr "物料已有物料凭证后不能再将其设置为固定资产。"
+#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:118
+msgid "Cannot cancel Asset Depreciation Schedule {0} as it has a draft journal entry {1}."
+msgstr ""
+
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:246
msgid "Cannot cancel POS Closing Entry"
msgstr ""
@@ -9720,7 +9738,7 @@ msgstr "无法为合并发票{0}创建退货。"
msgid "Cannot create root account."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1033
+#: erpnext/manufacturing/doctype/bom/bom.py:1044
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr "无法停用或取消BOM，因为它被其他BOM引用。"
@@ -9737,7 +9755,7 @@ msgstr "分类是“估值”或“估值和总计”的时候不能扣税。"
msgid "Cannot delete Exchange Gain/Loss row"
msgstr "无法删除汇兑损益行"
-#: erpnext/stock/doctype/serial_no/serial_no.py:118
+#: erpnext/stock/doctype/serial_no/serial_no.py:120
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr "无法删除已在库存业务单据中使用过的序列号{0}"
@@ -10183,11 +10201,11 @@ msgstr "链（长度单位）"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Change Amount"
msgstr "找零"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101
msgid "Change Release Date"
msgstr "更改解除冻结日期"
@@ -10200,7 +10218,7 @@ msgstr "更改解除冻结日期"
#: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:169
msgid "Change in Stock Value"
msgstr "库存金额变动"
@@ -11008,6 +11026,7 @@ msgstr "公司"
#. Label of the company (Link) field in DocType 'Opening Invoice Creation Tool'
#. Label of the company (Link) field in DocType 'Party Account'
#. Label of the company (Link) field in DocType 'Payment Entry'
+#. Label of the company (Link) field in DocType 'Payment Gateway Account'
#. Label of the company (Link) field in DocType 'Payment Ledger Entry'
#. Label of the company (Link) field in DocType 'Payment Order'
#. Label of the company (Link) field in DocType 'Payment Reconciliation'
@@ -11155,6 +11174,7 @@ msgstr "公司"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/party_account/party_account.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
+#: erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -11240,8 +11260,8 @@ msgstr "公司"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:8
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:401
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:484
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:465
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:548
#: erpnext/buying/doctype/customer_number_at_supplier/customer_number_at_supplier.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -11557,7 +11577,7 @@ msgstr "公司纳税登记号"
msgid "Company and Posting Date is mandatory"
msgstr "必须填写公司和过账日期"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2405
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr "两家公司的本币应匹配关联公司交易。"
@@ -12838,7 +12858,7 @@ 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:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:734
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:364
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
@@ -12857,7 +12877,7 @@ msgstr "成本"
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:462
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:526
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -13070,7 +13090,7 @@ msgstr "无法删除演示数据"
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr "无法自动创建客户，缺失必填字段："
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:673
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr "无法自动创建退款单，请取消选中'退款'并再次提交"
@@ -13193,15 +13213,15 @@ msgstr "贷方"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:132
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:143
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:219
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:656
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:680
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:112
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
+#: 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/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13443,7 +13463,7 @@ msgstr "新增商机"
msgid "Create POS Opening Entry"
msgstr "创建POS接班记录"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:58
+#: erpnext/accounts/doctype/payment_request/payment_request.js:66
msgid "Create Payment Entry"
msgstr "创建收付款凭证"
@@ -13599,7 +13619,7 @@ msgstr "创建科目......"
msgid "Creating Delivery Note ..."
msgstr "正在创建交货单..."
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:146
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:144
msgid "Creating Dimensions..."
msgstr "创建辅助核算......"
@@ -13619,7 +13639,7 @@ msgstr "正在创建采购发票..."
msgid "Creating Purchase Order ..."
msgstr "正在创建采购订单..."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13656,11 +13676,6 @@ msgstr "正在创建{}/{}个{}"
msgid "Creation"
msgstr "创建日期"
-#. Label of the purchase_document_no (Data) field in DocType 'Serial No'
-#: erpnext/stock/doctype/serial_no/serial_no.json
-msgid "Creation Document No"
-msgstr "源单据编号"
-
#: erpnext/utilities/bulk_transaction.py:189
msgid "Creation of {1}(s) successful"
msgstr "成功创建{1}"
@@ -13695,11 +13710,11 @@ msgstr "创建 {0} 部分成功。\n"
msgid "Credit"
msgstr "贷方"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:679
+#: erpnext/accounts/report/general_ledger/general_ledger.py:691
msgid "Credit (Transaction)"
msgstr "贷方(交易货币)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:666
msgid "Credit ({0})"
msgstr "贷方（{0}）"
@@ -13842,7 +13857,7 @@ 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:670
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
msgid "Credit Note {0} has been created automatically"
msgstr "退款单{0}已自动创建"
@@ -14050,7 +14065,7 @@ msgstr "杯"
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
#: erpnext/accounts/report/gross_profit/gross_profit.py:427
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:214
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
@@ -14149,7 +14164,7 @@ msgstr "货币不能使用其他货币进行输入后更改"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2317
+#: erpnext/accounts/utils.py:2319
msgid "Currency for {0} must be {1}"
msgstr "货币{0}必须{1}"
@@ -14499,6 +14514,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/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14526,6 +14542,10 @@ msgstr "客户 / 物料 / 物料组"
msgid "Customer / Lead Address"
msgstr "客户/线索地址"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Customer > Customer Group > Territory"
+msgstr ""
+
#. Name of a report
#. Label of a Link in the Selling Workspace
#: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -14927,7 +14947,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:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
msgid "Customer {0} does not belong to project {1}"
msgstr "客户{0}不属于项目{1}"
@@ -15279,7 +15299,7 @@ msgstr "签发日期"
msgid "Date of Joining"
msgstr "入职日期"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273
msgid "Date of Transaction"
msgstr "交易日期"
@@ -15416,11 +15436,11 @@ msgstr "亲爱的系统管理员，"
msgid "Debit"
msgstr "借方"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:672
+#: erpnext/accounts/report/general_ledger/general_ledger.py:684
msgid "Debit (Transaction)"
msgstr "借方(交易货币)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:647
+#: erpnext/accounts/report/general_ledger/general_ledger.py:659
msgid "Debit ({0})"
msgstr "借方（{0}）"
@@ -15494,7 +15514,7 @@ msgstr "借记科目（应收账款）"
msgid "Debit To is required"
msgstr "借记科目必填"
-#: erpnext/accounts/general_ledger.py:508
+#: erpnext/accounts/general_ledger.py:522
msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
msgstr "借{0}贷{1}不相等。差额为{2}。"
@@ -16561,7 +16581,7 @@ msgstr "演示数据已清除"
#. History'
#. Label of the department (Link) field in DocType 'Sales Person'
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:469
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:533
#: erpnext/projects/doctype/activity_cost/activity_cost.json
#: erpnext/projects/doctype/project/project.json
#: erpnext/projects/doctype/task/task.json
@@ -16636,9 +16656,9 @@ msgstr "按折旧日天数占比计提当月折旧"
msgid "Depreciate based on shifts"
msgstr "按班次折旧"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:387
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:455
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:213
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:451
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:519
msgid "Depreciated Amount"
msgstr "折旧额"
@@ -16694,6 +16714,14 @@ msgstr "折旧分录"
msgid "Depreciation Entry Posting Status"
msgstr "折旧凭证记账状态"
+#: erpnext/assets/doctype/asset/asset.py:1109
+msgid "Depreciation Entry against asset {0}"
+msgstr ""
+
+#: erpnext/assets/doctype/asset/depreciation.py:252
+msgid "Depreciation Entry against {0} worth {1}"
+msgstr ""
+
#. Label of the depreciation_expense_account (Link) field in DocType 'Asset
#. Category Account'
#. Label of the depreciation_expense_account (Link) field in DocType 'Company'
@@ -16702,7 +16730,7 @@ msgstr "折旧凭证记账状态"
msgid "Depreciation Expense Account"
msgstr "折旧费用科目"
-#: erpnext/assets/doctype/asset/depreciation.py:297
+#: erpnext/assets/doctype/asset/depreciation.py:299
msgid "Depreciation Expense Account should be an Income or Expense Account."
msgstr "折旧费用科目应为收入或费用类科目"
@@ -17588,6 +17616,10 @@ msgstr "折扣日"
msgid "Discount Percentage"
msgstr "折扣百分比"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "Discount Percentage can be applied either against a Price List or for all Price List."
+msgstr ""
+
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:52
msgid "Discount Percentage in Transaction"
msgstr ""
@@ -17820,7 +17852,7 @@ msgstr "发货设置"
msgid "Disposal Date"
msgstr "处置日期"
-#: erpnext/assets/doctype/asset/depreciation.py:822
+#: erpnext/assets/doctype/asset/depreciation.py:824
msgid "Disposal date {0} cannot be before {1} date {2} of the asset."
msgstr ""
@@ -18100,7 +18132,7 @@ msgstr "单据"
msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
msgstr "在5到100之间"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:254
msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
msgstr "不允许更新递延收入/费用相关会计凭证"
@@ -19139,7 +19171,7 @@ msgstr "空"
msgid "Ems(Pica)"
msgstr "Ems（派卡）"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr "请在库存设置中启用允许部分预留"
@@ -19490,7 +19522,7 @@ msgstr "输入工序名称，如切割"
msgid "Enter a name for this Holiday List."
msgstr "输入节假日列表名称"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:611
+#: erpnext/selling/page/point_of_sale/pos_payment.js:624
msgid "Enter amount to be redeemed."
msgstr "输入要兑换的金额"
@@ -19552,7 +19584,7 @@ msgstr "输入基于此物料清单生产的物料数量"
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr "输入生产数量。仅当设置此值时才会获取原材料"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:535
+#: erpnext/selling/page/point_of_sale/pos_payment.js:547
msgid "Enter {0} amount."
msgstr "输入{0}金额"
@@ -19572,7 +19604,7 @@ msgid "Entity"
msgstr "实体"
#. Label of the entity_type (Select) field in DocType 'Service Level Agreement'
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:211
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:123
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
msgid "Entity Type"
@@ -19667,7 +19699,7 @@ msgstr "评估标准公式时出错"
msgid "Error in party matching for Bank Transaction {0}"
msgstr "银行交易{0}交易方匹配错误"
-#: erpnext/assets/doctype/asset/depreciation.py:313
+#: erpnext/assets/doctype/asset/depreciation.py:315
msgid "Error while posting depreciation entries"
msgstr "过账折旧分录时出错"
@@ -19719,11 +19751,9 @@ msgstr "预计时间和成本"
msgid "Evaluation Period"
msgstr "评估频率"
-#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
-#. DocType 'Tax Withholding Category'
-#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
-msgid "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
-msgstr "未勾选应用预扣税的发票也将用于检查累计阈值突破"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:48
+msgid "Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:"
+msgstr ""
#. Label of the event (Data) field in DocType 'Advance Payment Ledger Entry'
#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
@@ -20084,7 +20114,7 @@ msgstr "残值"
msgid "Expense"
msgstr "费用"
-#: erpnext/controllers/stock_controller.py:785
+#: erpnext/controllers/stock_controller.py:787
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr "费用/差异科目({0})必须是一个“损益”类科目"
@@ -20129,7 +20159,7 @@ msgstr "费用/差异科目({0})必须是一个“损益”类科目"
msgid "Expense Account"
msgstr "费用科目"
-#: erpnext/controllers/stock_controller.py:765
+#: erpnext/controllers/stock_controller.py:767
msgid "Expense Account Missing"
msgstr "缺失差异科目"
@@ -20436,7 +20466,7 @@ msgstr "停机日期"
msgid "Failure Description"
msgstr "故障描述"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:29
+#: erpnext/accounts/doctype/payment_request/payment_request.js:37
msgid "Failure: {0}"
msgstr "故障：{0}"
@@ -21112,6 +21142,10 @@ msgstr "固定资产物料必须是一个非库存物料。"
msgid "Fixed Asset Register"
msgstr "固定资产台账"
+#: erpnext/manufacturing/doctype/bom/bom.py:668
+msgid "Fixed Asset item {0} cannot be used in BOMs."
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:25
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:38
msgid "Fixed Assets"
@@ -21242,7 +21276,7 @@ msgstr "默认供应商（可选）"
msgid "For Item"
msgstr "物料"
-#: erpnext/controllers/stock_controller.py:1328
+#: erpnext/controllers/stock_controller.py:1331
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr "基于 {2} {3} 物料 {0} 收货数量不能超过 {1}"
@@ -22134,7 +22168,7 @@ msgstr "报表日后付款参考"
msgid "Future Payments"
msgstr "未来付款"
-#: erpnext/assets/doctype/asset/depreciation.py:376
+#: erpnext/assets/doctype/asset/depreciation.py:378
msgid "Future date is not allowed"
msgstr "不允许未来日期"
@@ -22150,7 +22184,7 @@ msgstr "总账余额"
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:632
+#: erpnext/accounts/report/general_ledger/general_ledger.py:644
msgid "GL Entry"
msgstr "总账分录"
@@ -22416,8 +22450,8 @@ msgid "Get Items"
msgstr "选物料"
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:167
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:189
+#: 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
@@ -22776,7 +22810,7 @@ msgstr "克/升"
#: erpnext/accounts/report/pos_register/pos_register.py:202
#: erpnext/accounts/report/purchase_register/purchase_register.py:275
#: erpnext/accounts/report/sales_register/sales_register.py:305
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -22786,7 +22820,7 @@ msgstr "克/升"
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:180
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -22907,8 +22941,8 @@ msgstr "毛利率"
#. Label of the gross_purchase_amount (Currency) field in DocType 'Asset
#. Depreciation Schedule'
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:373
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:434
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:437
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:498
msgid "Gross Purchase Amount"
msgstr "总采购金额"
@@ -23259,7 +23293,7 @@ msgstr "百帕"
msgid "Height (cm)"
msgstr "高(公分)"
-#: erpnext/assets/doctype/asset/depreciation.py:336
+#: erpnext/assets/doctype/asset/depreciation.py:338
msgid "Hello,"
msgstr "您好："
@@ -23298,7 +23332,7 @@ msgstr "帮助文本"
msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
msgstr "若业务存在季节性波动，可帮助您将预算/目标分摊至各月"
-#: erpnext/assets/doctype/asset/depreciation.py:343
+#: erpnext/assets/doctype/asset/depreciation.py:345
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr "上述失败折旧分录的错误日志如下：{0}"
@@ -23394,7 +23428,7 @@ msgstr "临时冻结"
#. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice'
#. Label of the on_hold (Check) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Hold Invoice"
msgstr "冻结发票"
@@ -23488,6 +23522,10 @@ msgstr "小时"
msgid "Hours Spent"
msgstr "耗时"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "How Pricing Rule is applied?"
+msgstr ""
+
#. Label of the frequency (Select) field in DocType 'Email Digest'
#: erpnext/setup/doctype/email_digest/email_digest.json
msgid "How frequently?"
@@ -23828,6 +23866,10 @@ msgstr "如指定角色，则仅该角色的用户可提交过账日期早于当
msgid "If more than one package of the same type (for print)"
msgstr "如果同类包裹超过一个"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
+msgstr ""
+
#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
#. (Check) field in DocType 'Accounts Settings'
#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23844,6 +23886,10 @@ msgstr "请选择以下方式中的一种之后"
msgid "If rate is zero then item will be treated as \"Free Item\""
msgstr "若单价为0则为免费赠品"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field."
+msgstr ""
+
#. Description of the 'Supply Raw Materials for Purchase' (Check) field in
#. DocType 'Item'
#: erpnext/stock/doctype/item/item.json
@@ -23926,6 +23972,10 @@ msgstr "如勾选，一个工单可使用多个物料，此设置针对一个或
msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
msgstr "如勾选，物料清单成本会基于其原材料的成本价/价格表主数据/最新采购价自动更新"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions."
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14
msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
msgstr "如果积分无失效日期，请将失效日期设为空或0。"
@@ -24020,7 +24070,7 @@ msgstr "不包括无库存物料"
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:217
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -24072,7 +24122,7 @@ msgstr "已启用忽略定价规则，无法应用优惠券"
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:222
msgid "Ignore System Generated Credit / Debit Notes"
msgstr "隐藏系统生成的贷/借记单"
@@ -24835,7 +24885,7 @@ msgstr "来电设置"
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/report/available_serial_no/available_serial_no.py:146
-#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:159
+#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:167
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193
#: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96
@@ -24908,7 +24958,7 @@ msgstr "序列及批次包错误"
msgid "Incorrect Stock Value Report"
msgstr "异常物料凭证结余金额"
-#: erpnext/stock/serial_batch_bundle.py:135
+#: erpnext/stock/serial_batch_bundle.py:136
msgid "Incorrect Type of Transaction"
msgstr "交易类型错误"
@@ -25075,13 +25125,13 @@ msgstr "插入新记录"
msgid "Inspected By"
msgstr "检验人"
-#: erpnext/controllers/stock_controller.py:1222
+#: erpnext/controllers/stock_controller.py:1225
msgid "Inspection Rejected"
msgstr "质检不通过"
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1192
-#: erpnext/controllers/stock_controller.py:1194
+#: erpnext/controllers/stock_controller.py:1195
+#: erpnext/controllers/stock_controller.py:1197
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr "需要检验"
@@ -25098,7 +25148,7 @@ msgstr "需出货检验"
msgid "Inspection Required before Purchase"
msgstr "需来料检验"
-#: erpnext/controllers/stock_controller.py:1207
+#: erpnext/controllers/stock_controller.py:1210
msgid "Inspection Submission"
msgstr "质检单提交"
@@ -25128,7 +25178,7 @@ msgstr "安装通知单"
msgid "Installation Note Item"
msgstr "安装通知单项"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:624
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
msgid "Installation Note {0} has already been submitted"
msgstr "安装单{0}已经提交了"
@@ -25186,7 +25236,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:1078 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "库存不足"
@@ -25377,7 +25427,7 @@ msgstr "关联方交易"
msgid "Internal Work History"
msgstr "内部工作经历"
-#: erpnext/controllers/stock_controller.py:1289
+#: erpnext/controllers/stock_controller.py:1292
msgid "Internal transfers can only be done in company's default currency"
msgstr "直接调拨币种必须是公司本币"
@@ -25413,7 +25463,7 @@ msgid "Invalid Account"
msgstr "无效科目"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
-#: erpnext/accounts/doctype/payment_request/payment_request.py:861
+#: erpnext/accounts/doctype/payment_request/payment_request.py:862
msgid "Invalid Allocated Amount"
msgstr "无效分配金额"
@@ -25441,7 +25491,7 @@ msgstr "无效框架订单对所选客户和物料无效"
msgid "Invalid Child Procedure"
msgstr "无效子流程"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2185
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2184
msgid "Invalid Company for Inter Company Transaction."
msgstr "公司间交易的公司无效。"
@@ -25499,7 +25549,7 @@ msgid "Invalid Ledger Entries"
msgstr "异常总账凭证"
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:778
+#: erpnext/accounts/general_ledger.py:792
msgid "Invalid Opening Entry"
msgstr "无效的期初分录"
@@ -25527,7 +25577,7 @@ msgstr "无效的主要角色"
msgid "Invalid Priority"
msgstr "无效的优先级"
-#: erpnext/manufacturing/doctype/bom/bom.py:1082
+#: erpnext/manufacturing/doctype/bom/bom.py:1093
msgid "Invalid Process Loss Configuration"
msgstr "无效的工艺损耗配置"
@@ -25611,8 +25661,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118
-#: erpnext/accounts/general_ledger.py:821
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:835
+#: erpnext/accounts/general_ledger.py:845
msgid "Invalid value {0} for {1} against account {2}"
msgstr "对于科目{2} {1}值{0}无效"
@@ -25620,7 +25670,7 @@ msgstr "对于科目{2} {1}值{0}无效"
msgid "Invalid {0}"
msgstr "无效的{0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2183
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2182
msgid "Invalid {0} for Inter Company Transaction."
msgstr "Inter Company Transaction无效{0}。"
@@ -25830,7 +25880,7 @@ msgstr "已开票数量"
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2234
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2233
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26882,6 +26932,8 @@ msgstr "购物车"
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
#: 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_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
@@ -26900,7 +26952,11 @@ msgstr "物料号"
msgid "Item Code (Final Product)"
msgstr "成品物料号"
-#: erpnext/stock/doctype/serial_no/serial_no.py:81
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Item Code > Item Group > Brand"
+msgstr ""
+
+#: erpnext/stock/doctype/serial_no/serial_no.py:83
msgid "Item Code cannot be changed for Serial No."
msgstr "物料号不能因序列号改变"
@@ -27304,6 +27360,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/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -28224,7 +28281,7 @@ msgstr "报废记账日记账凭证"
msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
msgstr "资产折旧的日记账类型应设为折旧分录"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
msgstr "日记账凭证{0}没有科目{1}或已经匹配其他凭证"
@@ -28430,7 +28487,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: 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
@@ -29147,7 +29204,7 @@ msgstr "当地"
#: erpnext/assets/doctype/linked_location/linked_location.json
#: erpnext/assets/doctype/location/location.json
#: erpnext/assets/doctype/location/location_tree.js:10
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:477
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:541
#: erpnext/assets/workspace/assets/assets.json
#: erpnext/setup/doctype/vehicle/vehicle.json
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -29818,7 +29875,7 @@ msgstr "必填会计维度"
msgid "Mandatory Depends On"
msgstr "是否必填先决条件"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Mandatory Field"
msgstr "必填字段"
@@ -29908,6 +29965,7 @@ msgstr "请到会计设置-递延记账设置中取消勾选自动生成递延
#: erpnext/manufacturing/doctype/bom/bom_dashboard.py:15
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/operation/operation_dashboard.py:7
+#: erpnext/projects/doctype/project/project_dashboard.py:17
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:96
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/item/item_dashboard.py:32
@@ -30466,6 +30524,7 @@ msgid "Material Requested"
msgstr "已申请物料"
#. Label of the material_requests (Table) field in DocType 'Production Plan'
+#: erpnext/accounts/doctype/budget/budget.py:337
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
msgid "Material Requests"
msgstr "物料需求"
@@ -30821,7 +30880,7 @@ msgstr "信息"
msgid "Message Examples"
msgstr "消息示例"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:47
+#: erpnext/accounts/doctype/payment_request/payment_request.js:55
#: erpnext/setup/doctype/email_digest/email_digest.js:26
msgid "Message Sent"
msgstr "消息已发送"
@@ -31135,8 +31194,8 @@ 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/sales_invoice/sales_invoice.py:2250
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850
+#: 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
msgid "Missing Account"
msgstr "缺少账户"
@@ -31154,6 +31213,10 @@ msgstr "缺少成本中心"
msgid "Missing Default in Company"
msgstr "公司缺少默认值"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+msgid "Missing Filters"
+msgstr ""
+
#: erpnext/assets/doctype/asset/asset.py:350
msgid "Missing Finance Book"
msgstr "缺少财务账簿"
@@ -31186,7 +31249,7 @@ msgstr "必填字段信息缺失"
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr "未配置外发电子邮件模板。请在“出货设置”中设置。"
-#: erpnext/manufacturing/doctype/bom/bom.py:1041
+#: erpnext/manufacturing/doctype/bom/bom.py:1052
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr "缺失值"
@@ -31852,7 +31915,7 @@ msgstr "天然气"
msgid "Needs Analysis"
msgstr "需求分析"
-#: erpnext/stock/serial_batch_bundle.py:1366
+#: erpnext/stock/serial_batch_bundle.py:1381
msgid "Negative Batch Quantity"
msgstr "负批次数量"
@@ -32284,7 +32347,7 @@ msgstr "新销售订单"
msgid "New Sales Person Name"
msgstr "业务员姓名"
-#: erpnext/stock/doctype/serial_no/serial_no.py:68
+#: erpnext/stock/doctype/serial_no/serial_no.py:70
msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
msgstr "新序列号不能有仓库，仓库只能通过物料移动和采购入库设置。"
@@ -32320,7 +32383,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:249
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
msgid "New release date should be in the future"
msgstr "新的解除临时冻结日期必须晚于今天"
@@ -32429,7 +32492,7 @@ msgstr "没有控制措施"
msgid "No Answer"
msgstr "未答复"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2352
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr "未找到代表公司{0}的关联公司交易客户"
@@ -32486,9 +32549,9 @@ msgstr "未找到待核销发票"
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr "未找到POS配置，请先创建新POS配置"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691
#: erpnext/stock/doctype/item/item.py:1363
msgid "No Permission"
msgstr "无此权限"
@@ -32523,7 +32586,7 @@ msgstr "当前无可用库存"
msgid "No Summary"
msgstr "无摘要"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2335
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr "未找到代表公司{0}的关联公司交易供应商"
@@ -32621,7 +32684,7 @@ msgstr "物料车为空"
msgid "No items to be received are overdue"
msgstr "无已逾期待入库物料"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452
msgid "No matches occurred via auto reconciliation"
msgstr "无待核销单据"
@@ -32755,11 +32818,11 @@ msgstr "库存业务记账日期不得早于此日期"
msgid "No values"
msgstr "无金额"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "No {0} Accounts found for this company."
msgstr "本公司未找到{0}科目"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2400
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2399
msgid "No {0} found for Inter Company Transactions."
msgstr "关联公司交易没有找到{0}。"
@@ -32794,7 +32857,7 @@ msgstr "非折旧类目"
msgid "Non Profit"
msgstr "公益组织"
-#: erpnext/manufacturing/doctype/bom/bom.py:1409
+#: erpnext/manufacturing/doctype/bom/bom.py:1420
msgid "Non stock items"
msgstr "非库存物料"
@@ -32973,7 +33036,7 @@ msgstr "注意：到期日超过允许的{0}天信用期{1}天。"
msgid "Note: Email will not be sent to disabled users"
msgstr "注意：邮件不会发送给已禁用用户"
-#: erpnext/manufacturing/doctype/bom/bom.py:669
+#: erpnext/manufacturing/doctype/bom/bom.py:680
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr "注意：若需将产成品{0}作为原材料使用，请在物料表中对应的原材料行启用“不展开”复选框。"
@@ -32993,7 +33056,7 @@ msgstr "注：此成本中心勾选了是组，不能用于会计凭证记账。
msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
msgstr "注：要合并物料，请为旧物料{0}创建单独的库存对账"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1080
msgid "Note: {0}"
msgstr "注： {0}"
@@ -33009,6 +33072,7 @@ msgstr "注： {0}"
#. Label of the sb_01 (Section Break) field in DocType 'Quality Review'
#. Label of the notes (Small Text) field in DocType 'Manufacturer'
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:8
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
#: erpnext/crm/doctype/lead/lead.json
@@ -33444,6 +33508,12 @@ msgstr "只有子节点才可用于业务单据中"
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr "每个工单{1}仅能创建一个{0}条目"
+#. Description of the 'Consider Entire Party Ledger Amount' (Check) field in
+#. DocType 'Tax Withholding Category'
+#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+msgid "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach"
+msgstr ""
+
#. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Only show Customer of these Customer Groups"
@@ -33646,8 +33716,8 @@ msgstr "期初（借方）"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:159
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:380
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:448
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:444
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:512
msgid "Opening Accumulated Depreciation"
msgstr "已提折旧"
@@ -33689,7 +33759,7 @@ msgstr "问题提交日期"
msgid "Opening Entry"
msgstr "开账凭证"
-#: erpnext/accounts/general_ledger.py:777
+#: erpnext/accounts/general_ledger.py:791
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr "创建期间结账凭证后不可创建期初凭证"
@@ -33717,7 +33787,7 @@ msgid "Opening Invoice Item"
msgstr "待处理发票明细"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837
+#: 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}'以不过账任何舍入调整"
@@ -33791,7 +33861,7 @@ msgstr "工费成本（本币）"
msgid "Operating Cost Per BOM Quantity"
msgstr "每个成品工费成本"
-#: erpnext/manufacturing/doctype/bom/bom.py:1425
+#: erpnext/manufacturing/doctype/bom/bom.py:1436
msgid "Operating Cost as per Work Order / BOM"
msgstr "按工单/物料清单计算的运营成本"
@@ -33947,7 +34017,7 @@ msgstr "工序"
msgid "Operations Routing"
msgstr "工序路线"
-#: erpnext/manufacturing/doctype/bom/bom.py:1050
+#: erpnext/manufacturing/doctype/bom/bom.py:1061
msgid "Operations cannot be left blank"
msgstr "请填写工序信息"
@@ -34539,7 +34609,7 @@ msgstr "超量出/入库比率(%)"
msgid "Over Picking Allowance"
msgstr "允许超量拣货(％)"
-#: erpnext/controllers/stock_controller.py:1455
+#: erpnext/controllers/stock_controller.py:1458
msgid "Over Receipt"
msgstr "超收"
@@ -34991,7 +35061,7 @@ msgstr "套件明细"
msgid "Packed Items"
msgstr "套件明细"
-#: erpnext/controllers/stock_controller.py:1293
+#: erpnext/controllers/stock_controller.py:1296
msgid "Packed Items cannot be transferred internally"
msgstr "套件中的下层物料不可直接调拨"
@@ -35026,7 +35096,7 @@ msgstr "装箱单"
msgid "Packing Slip Item"
msgstr "装箱单项"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:640
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
msgid "Packing Slip(s) cancelled"
msgstr "装箱单（ S）取消"
@@ -35112,7 +35182,7 @@ msgstr "已付款"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172
#: erpnext/accounts/report/pos_register/pos_register.py:209
-#: erpnext/selling/page/point_of_sale/pos_payment.js:682
+#: erpnext/selling/page/point_of_sale/pos_payment.js:695
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:277
msgid "Paid Amount"
@@ -35387,7 +35457,7 @@ msgstr "部分发料"
msgid "Partial Payment in POS Transactions are not allowed."
msgstr "POS交易不支持部分付款。"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
msgid "Partial Stock Reservation"
msgstr "部分库存预留"
@@ -35581,9 +35651,9 @@ 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:711
+#: erpnext/accounts/report/general_ledger/general_ledger.py:723
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:26
@@ -35744,9 +35814,9 @@ 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:710
+#: erpnext/accounts/report/general_ledger/general_ledger.py:722
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
+#: 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
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:86
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js:15
@@ -35911,7 +35981,7 @@ msgstr "付款人设置"
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
#: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
@@ -36047,7 +36117,7 @@ msgid "Payment Entry has been modified after you pulled it. Please pull it again
msgstr "选择收付款凭证后有修改，请重新选取。"
#: erpnext/accounts/doctype/payment_request/payment_request.py:128
-#: erpnext/accounts/doctype/payment_request/payment_request.py:542
+#: erpnext/accounts/doctype/payment_request/payment_request.py:543
msgid "Payment Entry is already created"
msgstr "收付款凭证已创建"
@@ -36256,7 +36326,7 @@ msgstr "付款参考"
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:142
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:470
@@ -36282,11 +36352,11 @@ msgstr "收付款申请类型"
msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state."
msgstr "销售订单或采购订单生成的付款请求将处于草稿状态。禁用后单据将处于未保存状态"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:615
+#: erpnext/accounts/doctype/payment_request/payment_request.py:616
msgid "Payment Request for {0}"
msgstr "收付款申请{0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:557
+#: erpnext/accounts/doctype/payment_request/payment_request.py:558
msgid "Payment Request is already created"
msgstr "付款请求已创建"
@@ -36444,7 +36514,7 @@ msgstr "付款链接"
msgid "Payment Unlink Error"
msgstr "付款解除关联错误"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:948
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr "对{0} {1}的付款不能大于总未付金额{2}"
@@ -36765,7 +36835,7 @@ msgstr "期间"
msgid "Period Based On"
msgstr "期间基于"
-#: erpnext/accounts/general_ledger.py:789
+#: erpnext/accounts/general_ledger.py:803
msgid "Period Closed"
msgstr "会计期间已关闭"
@@ -37368,7 +37438,7 @@ msgstr "请将账户添加至根级公司-{}"
msgid "Please add {1} role to user {0}."
msgstr "请为用户{0}添加{1}角色"
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1469
msgid "Please adjust the qty or edit {0} to proceed."
msgstr "请调整数量或修改 {0} 后继续"
@@ -37376,7 +37446,7 @@ msgstr "请调整数量或修改 {0} 后继续"
msgid "Please attach CSV file"
msgstr "请附加CSV文件"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2987
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2986
msgid "Please cancel and amend the Payment Entry"
msgstr "请取消并修改付款分录"
@@ -37389,7 +37459,7 @@ msgstr "请先手动取消付款分录"
msgid "Please cancel related transaction."
msgstr "请取消相关交易。"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
msgid "Please check Multi Currency option to allow accounts with other currency"
msgstr "请勾选允许同一往来单位发票多货币"
@@ -37466,7 +37536,7 @@ msgstr "请为物料{0}创建采购入库或采购发票"
msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
msgstr "在合并{1}到{2}前，请先删除产品套装{0}"
-#: erpnext/assets/doctype/asset/depreciation.py:550
+#: erpnext/assets/doctype/asset/depreciation.py:552
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr "请暂时停用日记账凭证{0}的工作流。"
@@ -37590,7 +37660,7 @@ msgstr "请先输入采购入库号"
msgid "Please enter Receipt Document"
msgstr "请输入收据凭证"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1086
msgid "Please enter Reference date"
msgstr "参考日期请输入"
@@ -37715,8 +37785,8 @@ msgstr "不可撤销操作，确认要删除公司所有业务资料? 主数据
msgid "Please mention 'Weight UOM' along with Weight."
msgstr "在库存页签填写了了单重，请填写重量单位。"
-#: erpnext/accounts/general_ledger.py:626
-#: erpnext/accounts/general_ledger.py:633
+#: erpnext/accounts/general_ledger.py:640
+#: erpnext/accounts/general_ledger.py:647
msgid "Please mention '{0}' in Company: {1}"
msgstr "请在公司{1}中注明'{0}'"
@@ -37844,7 +37914,7 @@ msgstr "在选择往来单位之前请先选择记账日期"
msgid "Please select Posting Date first"
msgstr "请先选择记账日期"
-#: erpnext/manufacturing/doctype/bom/bom.py:1095
+#: erpnext/manufacturing/doctype/bom/bom.py:1106
msgid "Please select Price List"
msgstr "请选择价格表"
@@ -37876,7 +37946,7 @@ 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:1327
+#: erpnext/manufacturing/doctype/bom/bom.py:1338
msgid "Please select a BOM"
msgstr "请选择一个物料清单"
@@ -37966,6 +38036,10 @@ 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
+msgid "Please select at least one filter: Item Code, Batch, or Serial No."
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.js:886
msgid "Please select atleast one item to continue"
msgstr ""
@@ -37974,7 +38048,7 @@ msgstr ""
msgid "Please select atleast one operation to create Job Card"
msgstr ""
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751
msgid "Please select correct account"
msgstr "请选择正确的科目"
@@ -38055,15 +38129,15 @@ msgstr "请先选择{0}"
msgid "Please set 'Apply Additional Discount On'"
msgstr "请设置“额外折扣基于”"
-#: erpnext/assets/doctype/asset/depreciation.py:777
+#: erpnext/assets/doctype/asset/depreciation.py:779
msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
msgstr "请设置在公司的资产折旧成本中心“{0}"
-#: erpnext/assets/doctype/asset/depreciation.py:775
+#: erpnext/assets/doctype/asset/depreciation.py:777
msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
msgstr "请公司制定“关于资产处置收益/损失科目”{0}"
-#: erpnext/accounts/general_ledger.py:532
+#: erpnext/accounts/general_ledger.py:546
msgid "Please set '{0}' in Company: {1}"
msgstr "请在公司{1}设置'{0}'"
@@ -38071,7 +38145,7 @@ msgstr "请在公司{1}设置'{0}'"
msgid "Please set Account"
msgstr "请设置账户"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1728
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1727
msgid "Please set Account for Change Amount"
msgstr "请设置找零金额账户"
@@ -38097,7 +38171,7 @@ msgstr "请在{}设置会计维度{}"
msgid "Please set Company"
msgstr "请设公司"
-#: erpnext/assets/doctype/asset/depreciation.py:739
+#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr "请设置在资产类别{0}或公司折旧相关科目{1}"
@@ -38115,7 +38189,7 @@ msgstr "请为客户'％s'设置财务代码"
msgid "Please set Fiscal Code for the public administration '%s'"
msgstr "请为公共管理'％s'设置财政代码"
-#: erpnext/assets/doctype/asset/depreciation.py:725
+#: erpnext/assets/doctype/asset/depreciation.py:727
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr "请在资产类别{0}中设置固定资产科目。"
@@ -38178,7 +38252,7 @@ msgstr "请在仓库{0}中设置科目"
msgid "Please set an Address on the Company '%s'"
msgstr "请在公司'％s'上设置地址"
-#: erpnext/controllers/stock_controller.py:760
+#: erpnext/controllers/stock_controller.py:762
msgid "Please set an Expense Account in the Items table"
msgstr "请在物料表中设置费用账户"
@@ -38194,23 +38268,23 @@ msgstr "请在“税费和收费表”中至少设置一行"
msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
msgstr "请为公司{0}同时设置税号和财政代码"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2247
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2246
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr "请为付款方式{0}设置默认的现金或银行科目"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:84
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:181
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2847
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2846
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr "请在付款方式{}设置默认现金或银行账户"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:86
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:183
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2848
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "请在付款方式{}设置默认现金或银行账户"
-#: erpnext/accounts/utils.py:2312
+#: erpnext/accounts/utils.py:2314
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr "请在公司{}设置默认汇兑损益账户"
@@ -38314,7 +38388,7 @@ msgstr "请将{0}设为{1}，与原发票{2}使用的账户相同"
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr "请为公司{1}设置并启用账户类型为{0}的组账户"
-#: erpnext/assets/doctype/asset/depreciation.py:348
+#: erpnext/assets/doctype/asset/depreciation.py:350
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr "请将此邮件转发给支持团队以便排查和解决问题"
@@ -38327,7 +38401,7 @@ msgid "Please specify Company"
msgstr "请选择公司"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
msgid "Please specify Company to proceed"
msgstr "请输入公司后继续"
@@ -38500,6 +38574,7 @@ msgstr "邮政费用"
#. Label of the posting_date (Date) field in DocType 'Landed Cost Voucher'
#. Label of the posting_date (Date) field in DocType 'Repost Item Valuation'
#. Label of the posting_date (Date) field in DocType 'Serial and Batch Bundle'
+#. Label of the posting_date (Date) field in DocType 'Serial No'
#. Label of the posting_date (Date) field in DocType 'Stock Closing Balance'
#. Label of the posting_date (Date) field in DocType 'Stock Entry'
#. Label of the posting_date (Date) field in DocType 'Stock Ledger Entry'
@@ -38534,11 +38609,11 @@ 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:638
+#: erpnext/accounts/report/general_ledger/general_ledger.py:650
#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: 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:137
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94
#: erpnext/accounts/report/pos_register/pos_register.py:172
#: erpnext/accounts/report/purchase_register/purchase_register.py:169
@@ -38557,6 +38632,7 @@ msgstr "邮政费用"
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_closing_balance/stock_closing_balance.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -38566,6 +38642,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_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
@@ -39131,6 +39208,14 @@ msgstr "动态定价规则物料号"
msgid "Pricing Rule Item Group"
msgstr "动态定价规则物料组"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+msgid "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."
+msgstr ""
+
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:40
+msgid "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."
+msgstr ""
+
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr "动态定价规则{0}已更新"
@@ -39189,6 +39274,10 @@ msgstr "动态定价规则{0}已更新"
msgid "Pricing Rules"
msgstr "动态定价规则"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:46
+msgid "Pricing Rules are further filtered based on quantity."
+msgstr ""
+
#. Label of the primary_address (Text) field in DocType 'Supplier'
#. Label of the primary_address (Text) field in DocType 'Customer'
#: erpnext/buying/doctype/supplier/supplier.json
@@ -39576,7 +39665,7 @@ msgstr "流程描述"
msgid "Process Loss"
msgstr "制程损耗"
-#: erpnext/manufacturing/doctype/bom/bom.py:1078
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
msgid "Process Loss Percentage cannot be greater than 100"
msgstr "加工损耗百分比不能超过100"
@@ -40066,7 +40155,7 @@ msgstr "进展(%)"
#: 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:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
#: erpnext/accounts/report/gross_profit/gross_profit.py:357
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -40541,7 +40630,7 @@ msgstr "采购统计分析"
#. Label of the purchase_date (Date) field in DocType 'Asset'
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/assets/doctype/asset/asset.json
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:426
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:490
msgid "Purchase Date"
msgstr "采购日期"
@@ -40697,7 +40786,7 @@ msgstr "采购主数据管理员"
#. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt
#. Item'
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:152
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239
@@ -40873,9 +40962,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:171
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:662
+#: 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_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
@@ -41756,6 +41845,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/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
@@ -41872,7 +41962,7 @@ msgstr "数量不能超过{0}"
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr "加工/打包原材料后得到的成品物料数量"
-#: erpnext/manufacturing/doctype/bom/bom.py:659
+#: erpnext/manufacturing/doctype/bom/bom.py:660
msgid "Quantity required for Item {0} in row {1}"
msgstr "请为第{1}行的物料{0}输入需求数量"
@@ -42721,7 +42811,7 @@ msgid "Reason"
msgstr "原因"
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:273
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "临时冻结原因"
@@ -43157,7 +43247,7 @@ msgstr "兑换"
#. Label of the redeem_loyalty_points (Check) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:609
+#: erpnext/selling/page/point_of_sale/pos_payment.js:622
msgid "Redeem Loyalty Points"
msgstr "兑换积分"
@@ -43289,7 +43379,7 @@ msgstr "参考日期"
msgid "Reference"
msgstr "参考"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084
msgid "Reference #{0} dated {1}"
msgstr "参考＃ {0}记载日期为{1}"
@@ -43427,7 +43517,7 @@ msgstr "源单据"
msgid "Reference No"
msgstr "参考编号"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698
msgid "Reference No & Reference Date is required for {0}"
msgstr "{0}需要参考单据编号与参考日期"
@@ -43435,11 +43525,11 @@ msgstr "{0}需要参考单据编号与参考日期"
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr "使用了银行科目，请输入银行交易业务单号和业务日期"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703
msgid "Reference No is mandatory if you entered Reference Date"
msgstr "如果输入参考日期，参考单据编号必填"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266
msgid "Reference No."
msgstr "参考编号。"
@@ -43553,11 +43643,11 @@ msgstr "参考：{0}，物料代号：{1}和客户：{2}"
msgid "References"
msgstr "参考"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:384
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
msgid "References to Sales Invoices are Incomplete"
msgstr "销售发票参考不完整"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:379
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
msgid "References to Sales Orders are Incomplete"
msgstr "销售订单参考不完整"
@@ -43702,8 +43792,8 @@ 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:265
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:309
+#: 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.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
@@ -43722,7 +43812,7 @@ msgstr "离职日期"
msgid "Remaining"
msgstr "剩余"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:679
+#: erpnext/selling/page/point_of_sale/pos_payment.js:692
msgid "Remaining Amount"
msgstr "剩余金额"
@@ -43735,7 +43825,7 @@ msgstr "余额"
#. Label of the remark (Small Text) field in DocType 'Journal Entry'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/selling/page/point_of_sale/pos_payment.js:489
+#: erpnext/selling/page/point_of_sale/pos_payment.js:490
msgid "Remark"
msgstr "备注"
@@ -43784,7 +43874,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:740
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: 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
@@ -44096,7 +44186,7 @@ msgstr "收付款台账重过账明细"
msgid "Repost Status"
msgstr "重过账状态"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:145
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:146
msgid "Repost has started in the background"
msgstr "会计凭证更新任务在后台执行中"
@@ -44420,7 +44510,7 @@ msgstr "如所选联系人在保存后被修改请重新选择"
msgid "Reseller"
msgstr "经销商"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:39
+#: erpnext/accounts/doctype/payment_request/payment_request.js:47
msgid "Resend Payment Email"
msgstr "重新发送付款电子邮件"
@@ -44889,7 +44979,7 @@ msgstr "退货"
msgid "Return / Credit Note"
msgstr "退款/贷记单"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:130
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:133
msgid "Return / Debit Note"
msgstr "退款/借记单"
@@ -45413,12 +45503,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1920
+#: 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/sales_invoice/sales_invoice.py:1915
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "行＃{0}（付款表）：金额必须为正值"
@@ -45564,7 +45654,7 @@ msgstr "行＃{0}：有重复参考凭证{1} {2}"
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr "行＃{0}：预计交货日不能早于采购订单日"
-#: erpnext/controllers/stock_controller.py:762
+#: erpnext/controllers/stock_controller.py:764
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr "第 {0} 行：物料 {1}. {2} 差异科目必填"
@@ -45588,11 +45678,11 @@ msgstr "行号#{0}：产成品必须为{1}"
msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
msgstr "行号#{0}：废品{1}必须关联产成品"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746
msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
msgstr "第 {0} 行：{1} 仅限货方金额时填写源单据字段"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:756
msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
msgstr "第 {0} 行：{1} 仅限借方金额时填写源单据字段"
@@ -45612,7 +45702,7 @@ msgstr "行＃{0}：已添加"
msgid "Row #{0}: Item {1} does not exist"
msgstr "行号#{0}：物料{1}不存在"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr "第 {0} 行：物料 {1} 已拣货，请从拣货单创建库存预留单"
@@ -45648,7 +45738,7 @@ 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:1639
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr "第 {0} 行:物料 {2} 可预留库存数量仅有 {1}"
@@ -45693,15 +45783,15 @@ msgstr "行号#{0}：数量必须为正数"
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}"
-#: erpnext/controllers/stock_controller.py:1188
+#: erpnext/controllers/stock_controller.py:1191
msgid "Row #{0}: Quality Inspection is required for Item {1}"
msgstr "行号#{0}：物料{1}需进行质量检验"
-#: erpnext/controllers/stock_controller.py:1203
+#: erpnext/controllers/stock_controller.py:1206
msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
msgstr "行号#{0}：物料{2}的质量检验{1}未提交"
-#: erpnext/controllers/stock_controller.py:1218
+#: erpnext/controllers/stock_controller.py:1221
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr "行号#{0}：物料{2}的质量检验{1}被拒收"
@@ -45710,7 +45800,7 @@ msgstr "行号#{0}：物料{2}的质量检验{1}被拒收"
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "行号#{0}：物料{1}数量不能为零"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr "第 {0} 行：物料 {1} 预留数量须大于 0"
@@ -45807,19 +45897,19 @@ msgstr "行＃{0}：发票贴现的状态必须为{1} {2}"
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:1569
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr "不允许为未勾选允许库存的物料创建库存预留"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr "行号#{0}：不可在组仓库{1}预留库存"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr "行号#{0}：物料{1}已预留库存"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:538
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr "行号#{0}：仓库{2}中物料{1}的库存已预留"
@@ -45827,8 +45917,8 @@ msgstr "行号#{0}：仓库{2}中物料{1}的库存已预留"
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:1230
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr "第 {0} 行:仓库 {2} 中物料 {1}无可预留库存"
@@ -46009,7 +46099,7 @@ msgstr "行号{0}# 在{2} {3}的'供应原材料'表中未找到物料{1}"
msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
msgstr "行号{0}：接受数量和拒收数量不能同时为零"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr "行号{0}：科目{1}与交易方类型{2}的科目类型不一致"
@@ -46017,11 +46107,11 @@ msgstr "行号{0}：科目{1}与交易方类型{2}的科目类型不一致"
msgid "Row {0}: Activity Type is mandatory."
msgstr "第{0}行：作业类型信息必填。"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
msgid "Row {0}: Advance against Customer must be credit"
msgstr "第{0}行：预收客户款须记在贷方"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:729
msgid "Row {0}: Advance against Supplier must be debit"
msgstr "行{0}：对供应商预付应为借方"
@@ -46041,7 +46131,7 @@ msgstr "第 {0} 行：生产设置中已勾选 入库成品原材料成本取自
msgid "Row {0}: Bill of Materials not found for the Item {1}"
msgstr "没有为第{0}行的物料{1}定义物料清单"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:980
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr "第{0}行：借方与贷方不能同时为0"
@@ -46057,7 +46147,7 @@ msgstr "第 {0} 行 ：成本中心 {1} 不是公司 {3} 的有效成本中心"
msgid "Row {0}: Cost center is required for an item {1}"
msgstr "请为第{0}行的物料{1}输入成本中心"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:826
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr "行{0}：{1}不可关联退款凭证"
@@ -46065,7 +46155,7 @@ msgstr "行{0}：{1}不可关联退款凭证"
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr "行{0}：BOM＃的货币{1}应等于所选货币{2}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:821
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr "第{0}行：借方不能与{1}关联"
@@ -46081,7 +46171,7 @@ msgstr "第{0}行: 付款计划中的到期日不能早于记账日"
msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
msgstr "行号{0}：必须关联交货单物料或包装物料"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071
#: erpnext/controllers/taxes_and_totals.py:1203
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "请为第{0}行输入汇率"
@@ -46115,7 +46205,7 @@ msgstr "行{0}：开始和结束时间必填。"
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr "行{0}：{1} 与 {2} 的开始与结束时间有重叠"
-#: erpnext/controllers/stock_controller.py:1284
+#: erpnext/controllers/stock_controller.py:1287
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr "第 {0} 行，直接调拨发料仓必填"
@@ -46127,7 +46217,7 @@ msgstr "第{0}行：开始时间必须早于结束时间"
msgid "Row {0}: Hours value must be greater than zero."
msgstr "第{0}行：时长(小时)须大于零。"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846
msgid "Row {0}: Invalid reference {1}"
msgstr "第{0}行：无效参考{1}"
@@ -46151,7 +46241,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:595
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr "第 {0} 行：装箱数量必须与 {1} 数量相等"
@@ -46159,7 +46249,7 @@ msgstr "第 {0} 行：装箱数量必须与 {1} 数量相等"
msgid "Row {0}: Packing Slip is already created for Item {1}."
msgstr "行号{0}：已为物料{1}创建装箱单"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:872
msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
msgstr "行{0}：往来单位/科目{1} / {2}与{3} {4}不匹配"
@@ -46171,11 +46261,11 @@ msgstr "行{0}：请为应收/应付科目输入{1}往来类型和往来单位"
msgid "Row {0}: Payment Term is mandatory"
msgstr "行号{0}：支付条款为必填项"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720
msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
msgstr "行{0}：针对销售/采购订单收付款均须标记为预收/付"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
msgstr "行{0}：如果预付凭证，请为科目{1}勾选'预付？'。"
@@ -46243,7 +46333,7 @@ msgstr "行号{0}：折旧已处理后不可变更班次"
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr "行号{0}：原材料{1}必须关联外协物料"
-#: erpnext/controllers/stock_controller.py:1275
+#: erpnext/controllers/stock_controller.py:1278
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr "第 {0} 行，直接调拨收料仓必填"
@@ -46267,7 +46357,7 @@ msgstr "行号{0}：设置{1}周期时，起止日期差值必须大于等于{2}
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "行{0}：单位转换系数是必需的"
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1072
#: 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}必须指定工作站或工作站类型"
@@ -46288,7 +46378,7 @@ msgstr "第{0}行：{1}必须大于0"
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr "行 {0}: {1} {2} 不能与 {3} (组队帐户) {4}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr "行{0}：{1} {2}不相匹配{3}"
@@ -46681,7 +46771,7 @@ msgstr "销售发票非由用户{}创建"
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr "POS中已启用销售发票模式，请直接创建销售发票。"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
msgid "Sales Invoice {0} has already been submitted"
msgstr "销售发票{0}已提交过"
@@ -46910,7 +47000,7 @@ msgstr "销售订单状态"
msgid "Sales Order Trends"
msgstr "销售订单趋势"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
msgid "Sales Order required for Item {0}"
msgstr "销售订单为物料{0}的必须项"
@@ -47420,8 +47510,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:283
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47694,7 +47784,7 @@ msgstr "废料成本（本币）"
msgid "Scrap Warehouse"
msgstr "报废品仓"
-#: erpnext/assets/doctype/asset/depreciation.py:378
+#: erpnext/assets/doctype/asset/depreciation.py:380
msgid "Scrap date cannot be before purchase date"
msgstr "废料日期不能早于购买日期"
@@ -47767,7 +47857,7 @@ msgstr "秘书"
msgid "Section"
msgstr "段"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117
msgid "Section Code"
msgstr "部分代码"
@@ -48138,7 +48228,7 @@ msgstr "设置客户首选联系人后，可以使用手机号过滤客户"
msgid "Selected POS Opening Entry should be open."
msgstr "选定的POS期初条目应为开启状态。"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2394
msgid "Selected Price List should have buying and selling fields checked."
msgstr "价格表主数据中应勾选采购和销售。"
@@ -48322,7 +48412,7 @@ msgstr "发送附件"
msgid "Sender"
msgstr "发件人"
-#: erpnext/accounts/doctype/payment_request/payment_request.js:44
+#: erpnext/accounts/doctype/payment_request/payment_request.js:52
msgid "Sending"
msgstr "发送中"
@@ -48446,7 +48536,9 @@ msgstr "序列号/批号"
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
#: 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:147
+#: 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_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
@@ -48477,7 +48569,9 @@ msgid "Serial No Count"
msgstr "序列号计数"
#. Name of a report
+#. Label of a Link in the Stock Workspace
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.json
+#: erpnext/stock/workspace/stock/stock.json
msgid "Serial No Ledger"
msgstr "序列号台帐"
@@ -48485,7 +48579,7 @@ msgstr "序列号台帐"
msgid "Serial No Range"
msgstr "序列号范围"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1942
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1954
msgid "Serial No Reserved"
msgstr "已预留序列号"
@@ -48525,6 +48619,13 @@ msgstr "序列号和批号"
msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
msgstr "启用序列号/批次字段时不可使用序列号批次选择器"
+#. Name of a report
+#. Label of a Link in the Stock Workspace
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.json
+#: erpnext/stock/workspace/stock/stock.json
+msgid "Serial No and Batch Traceability"
+msgstr ""
+
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909
msgid "Serial No is mandatory"
msgstr "序列号为必填项"
@@ -48554,7 +48655,7 @@ msgstr "序列号{0}不属于物料{1}"
msgid "Serial No {0} does not exist"
msgstr "序列号{0}不存在"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2711
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2722
msgid "Serial No {0} does not exists"
msgstr "序列号{0}不存在"
@@ -48603,7 +48704,7 @@ msgstr "序列号/批次号"
msgid "Serial Nos and Batches"
msgstr "序列号和批号"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1430
msgid "Serial Nos are created successfully"
msgstr "序列号创建成功"
@@ -48681,11 +48782,11 @@ msgstr "序列号与批号"
msgid "Serial and Batch Bundle"
msgstr "序列号与批号"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1651
msgid "Serial and Batch Bundle created"
msgstr "序列号批次组合已创建"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1717
msgid "Serial and Batch Bundle updated"
msgstr "序列号批次组合已更新"
@@ -49119,7 +49220,7 @@ msgstr "到岸成本(采购入库)以采购发票价为准"
msgid "Set Loyalty Program"
msgstr "设置忠诚度计划"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:303
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
msgid "Set New Release Date"
msgstr "设置解除冻结日期"
@@ -49374,7 +49475,7 @@ msgstr "银行对账功能仅限本公司银行户头"
msgid "Setting up company"
msgstr "创建公司"
-#: erpnext/manufacturing/doctype/bom/bom.py:1040
+#: erpnext/manufacturing/doctype/bom/bom.py:1051
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49558,7 +49659,7 @@ msgstr "运输类型"
msgid "Shipment details"
msgstr "运输详情"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:786
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
msgid "Shipments"
msgstr "发货"
@@ -49805,6 +49906,10 @@ msgstr "显示已冲销单据"
msgid "Show Completed"
msgstr "显示已完成"
+#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+msgid "Show Credit / Debit in Company Currency"
+msgstr ""
+
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
msgid "Show Cumulative Amount"
msgstr "显示累计金额"
@@ -49920,7 +50025,7 @@ msgstr "预览"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:128
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:165
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:212
msgid "Show Remarks"
msgstr "显示备注信息"
@@ -50227,13 +50332,27 @@ msgstr "来源"
msgid "Source DocType"
msgstr "源DocType"
+#. Label of the source_document_section (Section Break) field in DocType
+#. 'Serial No'
+#: erpnext/stock/doctype/serial_no/serial_no.json
+msgid "Source Document"
+msgstr ""
+
#. Label of the reference_name (Dynamic Link) field in DocType 'Batch'
+#. Label of the reference_name (Dynamic Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Name"
msgstr "源单据编号"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+msgid "Source Document No"
+msgstr ""
+
#. Label of the reference_doctype (Link) field in DocType 'Batch'
+#. Label of the reference_doctype (Link) field in DocType 'Serial No'
#: erpnext/stock/doctype/batch/batch.json
+#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Source Document Type"
msgstr "源单据类型"
@@ -50304,7 +50423,7 @@ msgstr "发料仓地址"
msgid "Source Warehouse Address Link"
msgstr "发料仓地址(链接)"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr "物料{0}必须指定来源仓库。"
@@ -50815,7 +50934,7 @@ msgstr "省/市/自治州"
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:489
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:381
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
@@ -51158,7 +51277,7 @@ msgstr "物料移动{0}已创建"
msgid "Stock Entry {0} has created"
msgstr "库存分录{0}已创建"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359
msgid "Stock Entry {0} is not submitted"
msgstr "物料移动{0}不提交"
@@ -51381,13 +51500,13 @@ msgstr "物料成本价追溯调整设置"
#: 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:1233
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644
+#: 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_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51396,13 +51515,13 @@ msgstr "物料成本价追溯调整设置"
msgid "Stock Reservation"
msgstr "库存预留"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
msgid "Stock Reservation Entries Cancelled"
msgstr "库存预留单已取消"
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Stock Reservation Entries Created"
msgstr "库存预留单已创建"
@@ -51424,7 +51543,7 @@ msgstr "出库后库存预留单不可修改"
msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr "基于拣货单创建的库存预留单不可修改，建议取消当前单据再创建新单据"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:548
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
msgid "Stock Reservation Warehouse Mismatch"
msgstr "库存预留仓库不匹配"
@@ -51669,7 +51788,7 @@ msgstr "库存与生产"
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr "不允许为勾选是组的仓库 {0} 创建库存预留单"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr "不允许为勾选是组的仓库 {0} 创建库存预留单"
@@ -51685,7 +51804,7 @@ 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:1127
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
msgid "Stock has been unreserved for work order {0}."
msgstr "已取消工单{0}的库存预留"
@@ -52553,10 +52672,15 @@ 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/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "供应商"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:50
+msgid "Supplier > Supplier Type"
+msgstr ""
+
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
#. Invoice'
#. Label of the section_addresses (Section Break) field in DocType 'Purchase
@@ -52669,7 +52793,7 @@ msgstr "供应商发票"
#. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224
msgid "Supplier Invoice Date"
msgstr "供应商发票日期"
@@ -52683,8 +52807,8 @@ 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:735
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "供应商发票号"
@@ -53231,16 +53355,16 @@ msgstr "因为 {1} 中的物料 {0} 金额为0系统无法进行超额开票防
msgid "System will notify to increase or decrease quantity or amount "
msgstr "系统将通知增减数量或金额"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TCS Amount"
msgstr "TCS金额"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TCS Rate %"
msgstr "TCS税率%"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253
msgid "TDS Amount"
msgstr "TDS金额"
@@ -53257,7 +53381,7 @@ msgstr "已扣除TDS"
msgid "TDS Payable"
msgstr "应付TDS"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125
msgid "TDS Rate %"
msgstr "代扣所得税率％"
@@ -53813,7 +53937,7 @@ msgstr "税别"
msgid "Tax Withheld Vouchers"
msgstr "代缴税款凭证"
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347
msgid "Tax Withholding"
msgstr "税款代扣代缴"
@@ -54439,7 +54563,7 @@ msgstr "门户询价申请功能已禁用。如需启用，请在门户设置中
msgid "The BOM which will be replaced"
msgstr "此物料清单将被替换"
-#: erpnext/stock/serial_batch_bundle.py:1363
+#: erpnext/stock/serial_batch_bundle.py:1378
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr "批次{0}在仓库{2}中存在负数量{1}。请更正数量"
@@ -54467,7 +54591,7 @@ msgstr "总账分录将在后台取消，可能需要几分钟"
msgid "The Loyalty Program isn't valid for the selected company"
msgstr "积分方案对所选公司无效"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:957
+#: erpnext/accounts/doctype/payment_request/payment_request.py:958
msgid "The Payment Request {0} is already paid, cannot process payment twice"
msgstr "付款申请{0}已支付，不能重复处理"
@@ -54491,7 +54615,7 @@ msgstr "该销售员与{0}相关联"
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr "第{0}行的序列号{1}在仓库{2}中不可用"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1939
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1951
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr "序列号{0}已为{1}{2}预留，不能用于其他交易"
@@ -54513,7 +54637,7 @@ msgstr "拆卸订单必须关联工单"
msgid "The account head under Liability or Equity, in which Profit/Loss will be booked"
msgstr "负债或权益下的科目，用于利润/亏损记账"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:858
+#: erpnext/accounts/doctype/payment_request/payment_request.py:859
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr "分配金额超过付款申请{0}的未清金额"
@@ -54554,7 +54678,7 @@ msgstr "转出股东的字段不能为空"
msgid "The field To Shareholder cannot be blank"
msgstr "“转入股东”字段不能为空"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:398
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
msgid "The field {0} in row {1} is not set"
msgstr "第{1}行的字段{0}未设置"
@@ -54570,7 +54694,7 @@ msgstr "作品集编号不匹配"
msgid "The following Items, having Putaway Rules, could not be accomodated:"
msgstr "以下存在上架规则的物料无法安置："
-#: erpnext/assets/doctype/asset/depreciation.py:338
+#: erpnext/assets/doctype/asset/depreciation.py:340
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr "以下资产自动计提折旧失败：{0}"
@@ -54831,6 +54955,10 @@ msgstr ""
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr "{0} {1} 用于计算入库成品成本"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:44
+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
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr "资产存在有效维护或维修记录。取消前需完成所有相关操作"
@@ -55097,7 +55225,7 @@ msgstr "本计划因销售发票{1}取消恢复资产{0}时创建。"
msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
msgstr "因取消资产资本化{1}，已为资产{0} 创建折旧计划"
-#: erpnext/assets/doctype/asset/depreciation.py:452
+#: erpnext/assets/doctype/asset/depreciation.py:454
msgid "This schedule was created when Asset {0} was restored."
msgstr "针对固定资产 {0} 恢复的折旧计划已创建"
@@ -55105,7 +55233,7 @@ msgstr "针对固定资产 {0} 恢复的折旧计划已创建"
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr "因经由销售发票 {1} 退回，已创建固定资产{0} 折旧计划"
-#: erpnext/assets/doctype/asset/depreciation.py:411
+#: erpnext/assets/doctype/asset/depreciation.py:413
msgid "This schedule was created when Asset {0} was scrapped."
msgstr "针对固定资产 {0} 报废的折旧计划已创建"
@@ -55880,6 +56008,10 @@ msgstr "第{0}行的物料单价要含税，第{1}行的税也必须包括在内
msgid "To merge, following properties must be same for both items"
msgstr "若要合并，两个物料的以下属性必须相同"
+#: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42
+msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.py:517
msgid "To overrule this, enable '{0}' in company {1}"
msgstr "要否决此问题，请在公司{1}中启用“ {0}”"
@@ -55897,7 +56029,7 @@ msgid "To submit the invoice without purchase receipt please set {0} as {1} in {
msgstr "若要提交没有购买收据的发票，请在 {2}中将 {0} 设置为 {1}"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:48
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:234
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr "要使用不同的财务账簿，请取消选中“包括默认 FB 资产”"
@@ -56119,7 +56251,7 @@ msgstr "分配总额"
#. Label of the total_amount (Currency) field in DocType 'Stock Entry'
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241
#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131
#: erpnext/selling/page/sales_funnel/sales_funnel.py:167
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -56281,7 +56413,7 @@ msgstr "总贷方/借方应与关联的日记账凭证相同"
msgid "Total Debit"
msgstr "借方合计"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:986
msgid "Total Debit must be equal to Total Credit. The difference is {0}"
msgstr "总借方必须等于总贷方，差异{0}。"
@@ -56874,6 +57006,10 @@ msgstr "总计"
msgid "Traceability"
msgstr "可追溯性"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:53
+msgid "Tracebility Direction"
+msgstr ""
+
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
@@ -56914,7 +57050,7 @@ msgstr "跟踪链接"
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. Label of the transaction (Select) field in DocType 'Authorization Rule'
#. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation'
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -57012,7 +57148,7 @@ msgstr "业务交易设置"
#. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
#: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
#: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264
msgid "Transaction Type"
msgstr "交易类型"
@@ -57034,7 +57170,7 @@ msgstr "交易参考编号 {0} 日期 {1}"
#. Group in Bank Account's connections
#: erpnext/accounts/doctype/bank_account/bank_account.json
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:463
#: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
#: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
#: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -57631,7 +57767,11 @@ msgstr "未分配金额"
msgid "Unassigned Qty"
msgstr "未分配数量"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105
+#: erpnext/accounts/doctype/budget/budget.py:360
+msgid "Unbilled Orders"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
msgid "Unblock Invoice"
msgstr "取消发票冻结"
@@ -58998,7 +59138,7 @@ msgstr ""
msgid "Vendor Invoices"
msgstr ""
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:539
msgid "Vendor Name"
msgstr "供应商名称"
@@ -59065,7 +59205,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:670
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
#: 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
@@ -59256,11 +59396,11 @@ 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:703
+#: erpnext/accounts/report/general_ledger/general_ledger.py:715
#: 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
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -59295,7 +59435,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:697
+#: erpnext/accounts/report/general_ledger/general_ledger.py:709
msgid "Voucher Subtype"
msgstr "源凭证业务类型"
@@ -59327,9 +59467,9 @@ 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:695
+#: erpnext/accounts/report/general_ledger/general_ledger.py:707
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
-#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
+#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
@@ -59348,6 +59488,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_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
@@ -59557,6 +59698,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_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
@@ -59665,7 +59807,7 @@ msgstr "仓库及参考"
msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
msgstr "此仓库已有物料凭证，无法删除。"
-#: erpnext/stock/doctype/serial_no/serial_no.py:83
+#: erpnext/stock/doctype/serial_no/serial_no.py:85
msgid "Warehouse cannot be changed for Serial No."
msgstr "仓库不能为序列号变更"
@@ -59678,7 +59820,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:425
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
msgid "Warehouse required for stock Item {0}"
msgstr "物料{0}需要指定仓库"
@@ -59829,7 +59971,7 @@ msgstr "负库存预警"
msgid "Warning!"
msgstr "警告！"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365
msgid "Warning: Another {0} # {1} exists against stock entry {2}"
msgstr "警告：库存凭证{2}中已存在另一个{0}＃{1}"
@@ -60312,6 +60454,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/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "生产工单"
@@ -60787,7 +60930,7 @@ msgstr "您正在导入代码列表的数据："
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr "根据{}工作流设置的条件，您无权更新"
-#: erpnext/accounts/general_ledger.py:768
+#: erpnext/accounts/general_ledger.py:782
msgid "You are not authorized to add or update entries before {0}"
msgstr "你未被授权在会计设置->会计关账 中设置的冻结记账截止日 {0} 前新增或变更会计凭证。"
@@ -60819,7 +60962,7 @@ msgstr "您还可以在公司{}主数据中设置默认在建工程科目"
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr "您可以将上级科目更改为资产负债表科目或选择其他科目"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:762
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr "您不能在“对日记账凭证”列中选择此凭证。"
@@ -60836,7 +60979,7 @@ msgstr "您只能按此顺序兑换最多{0}个积分。"
msgid "You can only select one mode of payment as default"
msgstr "只能选择一个支付方式作为默认"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:590
+#: erpnext/selling/page/point_of_sale/pos_payment.js:603
msgid "You can redeem upto {0}."
msgstr "您最多可兑换{0}"
@@ -60868,11 +61011,11 @@ msgstr "不能在已关闭会计期间 {1} 创建 {0}"
msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
msgstr "在已关闭的会计期间{0}内无法创建或取消会计分录"
-#: erpnext/accounts/general_ledger.py:788
+#: erpnext/accounts/general_ledger.py:802
msgid "You cannot create/amend any accounting entries till this date."
msgstr "不允许创建/修改早于此日期的会计凭证"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:995
msgid "You cannot credit and debit same account at the same time"
msgstr "同一科目不可同时有借方和贷方。"
@@ -60888,7 +61031,7 @@ msgstr "您不能编辑根节点。"
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_payment.js:620
+#: erpnext/selling/page/point_of_sale/pos_payment.js:633
msgid "You cannot redeem more than {0}."
msgstr "您不能兑换超过{0}"
@@ -60920,7 +61063,7 @@ msgstr "您无权{} {}。"
msgid "You don't have enough Loyalty Points to redeem"
msgstr "您的忠诚度积分不足"
-#: erpnext/selling/page/point_of_sale/pos_payment.js:583
+#: erpnext/selling/page/point_of_sale/pos_payment.js:596
msgid "You don't have enough points to redeem."
msgstr "您的积分不足以兑换"
@@ -61346,7 +61489,7 @@ msgstr "标题"
msgid "to"
msgstr "至"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2988
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr "在取消前需先解除此退货发票的金额分配"
@@ -61386,7 +61529,7 @@ msgstr "{0}"
msgid "{0} '{1}' is disabled"
msgstr "{0}“{1}”已禁用"
-#: erpnext/accounts/utils.py:185
+#: erpnext/accounts/utils.py:186
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr "{0}“ {1}”不属于{2}财年"
@@ -61418,7 +61561,7 @@ msgstr "{0}优惠券已使用{1}次，可用次数已耗尽"
msgid "{0} Digest"
msgstr "{0}统计信息"
-#: erpnext/accounts/utils.py:1404
+#: erpnext/accounts/utils.py:1405
msgid "{0} Number {1} is already used in {2} {3}"
msgstr "{0} 代码 {1} 已被 {2} {3} 占用"
@@ -61434,7 +61577,7 @@ msgstr "{0}申请{1}"
msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
msgstr "{0}保留样品基于批号，请在物料主数据中勾选启用批号管理"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:457
msgid "{0} Transaction(s) Reconciled"
msgstr "{0}笔交易已对账"
@@ -61450,19 +61593,19 @@ msgstr "{0}科目类型不是{1}"
msgid "{0} account not found while submitting purchase receipt"
msgstr "提交采购收据时未找到{0}科目"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115
msgid "{0} against Bill {1} dated {2}"
msgstr "{0}对日期为{2}的发票{1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1124
msgid "{0} against Purchase Order {1}"
msgstr "{0}不允许采购订单{1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1091
msgid "{0} against Sales Invoice {1}"
msgstr "{0}不允许销售发票{1}"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098
msgid "{0} against Sales Order {1}"
msgstr "{0}不允许销售订单{1}"
@@ -61470,7 +61613,7 @@ msgstr "{0}不允许销售订单{1}"
msgid "{0} already has a Parent Procedure {1}."
msgstr "{0}已有父程序{1}。"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:543
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
msgid "{0} and {1}"
msgstr "{0}和{1}"
@@ -61529,7 +61672,7 @@ msgstr "{0}输入了两次税项"
msgid "{0} entered twice {1} in Item Taxes"
msgstr "{0}在物料税{1}中重复输入"
-#: erpnext/accounts/utils.py:122
+#: erpnext/accounts/utils.py:123
#: erpnext/projects/doctype/activity_cost/activity_cost.py:40
msgid "{0} for {1}"
msgstr "{0} {1}"
@@ -61582,7 +61725,7 @@ msgid "{0} is mandatory for Item {1}"
msgstr "{0}是{1}的必填项"
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99
-#: erpnext/accounts/general_ledger.py:812
+#: erpnext/accounts/general_ledger.py:826
msgid "{0} is mandatory for account {1}"
msgstr "对于科目 {1} {0} 必填"
@@ -61657,7 +61800,7 @@ msgstr "{0}物料已完工"
msgid "{0} must be negative in return document"
msgstr "{0}在退货凭证中必须为负"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2195
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr "不允许{0}与{1}进行交易。请更改公司或在客户记录的'允许交易对象'章节添加该公司"
@@ -61673,7 +61816,7 @@ msgstr "{0}参数无效"
msgid "{0} payment entries can not be filtered by {1}"
msgstr "{0}收付款凭证不能由{1}过滤"
-#: erpnext/controllers/stock_controller.py:1458
+#: erpnext/controllers/stock_controller.py:1461
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr "已收到物料 {1} 数量 {0} 到仓库 {2}，占用库容 {3}"
@@ -61734,7 +61877,7 @@ msgstr "{0}{1}"
msgid "{0} {1} Manually"
msgstr "手动{0}{1}"
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461
msgid "{0} {1} Partially Reconciled"
msgstr "{0}{1}部分对账"
@@ -61799,7 +61942,7 @@ msgstr "{0} {1}被取消或停止"
msgid "{0} {1} is cancelled so the action cannot be completed"
msgstr "{0} {1}已被取消，因此操作无法完成"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:910
msgid "{0} {1} is closed"
msgstr "{0} {1} 已关闭"
@@ -61811,7 +61954,7 @@ msgstr "{0} {1}已禁用"
msgid "{0} {1} is frozen"
msgstr "{0} {1}已冻结"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:907
msgid "{0} {1} is fully billed"
msgstr "{0} {1}已完全开票"
@@ -61823,12 +61966,12 @@ msgstr "{0} {1} 未生效"
msgid "{0} {1} is not associated with {2} {3}"
msgstr "{0} {1}与{2} {3}无关"
-#: erpnext/accounts/utils.py:118
+#: erpnext/accounts/utils.py:119
msgid "{0} {1} is not in any active Fiscal Year"
msgstr "{0} {1} 不在有效财年中"
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:904
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943
msgid "{0} {1} is not submitted"
msgstr "{0} {1}未提交"
@@ -61840,7 +61983,7 @@ msgstr "{0}{1}已暂挂"
msgid "{0} {1} must be submitted"
msgstr "{0} {1}必须提交"
-#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252
+#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269
msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
msgstr "不允许更新 {0} {1} 会计凭证，请在 {2} 中启用允许更新"
@@ -61875,7 +62018,7 @@ msgstr "{0} {1}: 科目{2}无效"
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr "{0} {1}在{2}会计分录只能用货币单位：{3}"
-#: erpnext/controllers/stock_controller.py:791
+#: erpnext/controllers/stock_controller.py:793
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr "{0} {1}：请为物料 {2} 填写成本中心"
@@ -61953,7 +62096,7 @@ msgstr "{doctype}{name}已取消或关闭"
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr "外协{doctype}必须填写{field_label}"
-#: erpnext/controllers/stock_controller.py:1739
+#: erpnext/controllers/stock_controller.py:1742
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr "{item_name}的样本量({sample_size})不得超过验收数量({accepted_quantity})"
@@ -61961,7 +62104,7 @@ msgstr "{item_name}的样本量({sample_size})不得超过验收数量({accepted
msgid "{ref_doctype} {ref_name} is {status}."
msgstr "{ref_doctype}{ref_name}的状态为{status}"
-#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:366
+#: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:430
msgid "{}"
msgstr "{}"
@@ -62019,7 +62162,7 @@ msgstr "{} 待处理"
msgid "{} To Bill"
msgstr "{} 待开发票"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1979
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1978
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr "无法取消{}，因已兑换获得的积分。请先取消{}编号{}"