From 61e96f3fb5d247fab088a62217dc62706f4e9683 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Tue, 13 May 2025 18:13:26 +0200 Subject: [PATCH 1/7] fix: find table row --- erpnext/public/js/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js index 9707d64c2f3..0a89be379ed 100755 --- a/erpnext/public/js/utils.js +++ b/erpnext/public/js/utils.js @@ -721,7 +721,7 @@ erpnext.utils.update_child_items = function (opts) { } = r.message; const row = dialog.fields_dict.trans_items.df.data.find( - (doc) => doc.idx == me.doc.idx + (row) => row.name == me.doc.name ); if (row) { Object.assign(row, { From 7987ba9b7c631e315870e771c2065f1606a0a88d Mon Sep 17 00:00:00 2001 From: Karuppasamy923 Date: Wed, 11 Jun 2025 02:41:53 +0530 Subject: [PATCH 2/7] feat(bank-statement-import): add support for uploading MT940 format bank statements --- .../bank_statement_import.js | 73 +++++++++++++---- .../bank_statement_import.json | 21 ++++- .../bank_statement_import.py | 79 ++++++++++++++++++- pyproject.toml | 3 + 4 files changed, 156 insertions(+), 20 deletions(-) diff --git a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js index bdad264d4f0..0f01e2dfb65 100644 --- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js +++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js @@ -70,7 +70,7 @@ frappe.ui.form.on("Bank Statement Import", { frm.get_field("import_file").df.options = { restrictions: { - allowed_file_types: [".csv", ".xls", ".xlsx"], + allowed_file_types: [".csv", ".xls", ".xlsx", ".TXT", ".txt"], }, }; @@ -81,6 +81,7 @@ frappe.ui.form.on("Bank Statement Import", { refresh(frm) { frm.page.hide_icon_group(); + frm.trigger("toggle_mt940_note"); frm.trigger("update_indicators"); frm.trigger("import_file"); frm.trigger("show_import_log"); @@ -192,6 +193,24 @@ frappe.ui.form.on("Bank Statement Import", { }); }, + import_mt940_fromat(frm) { + frm.trigger("toggle_mt940_note"); + frm.save(); + }, + + toggle_mt940_note(frm) { + if (!frm.doc.import_mt940_fromat) { + frm.set_df_property("custom_delimiters", "hidden", 0); + frm.set_df_property("google_sheets_url", "hidden", 0); + frm.set_df_property("html_5", "hidden", 0); + } else { + frm.set_df_property("custom_delimiters", "hidden", 1); + frm.set_df_property("google_sheets_url", "hidden", 1); + frm.set_df_property("html_5", "hidden", 1); + } + frm.set_value("import_mt940_fromat", frm.doc.import_mt940_fromat); + }, + show_report_error_button(frm) { if (frm.doc.status === "Error") { frappe.db @@ -290,23 +309,45 @@ frappe.ui.form.on("Bank Statement Import", { .html(__("Loading import file...")) .appendTo(frm.get_field("import_preview").$wrapper); - frm.call({ - method: "get_preview_from_template", - args: { - data_import: frm.doc.name, - import_file: frm.doc.import_file, - google_sheets_url: frm.doc.google_sheets_url, + frappe.run_serially([ + // Convert MT940 to CSV if .txt file + () => { + if (frm.doc.import_file && frm.doc.import_file.toLowerCase().endsWith(".txt")) { + return frm + .call({ + method: "convert_mt940_to_csv", + args: { + data_import: frm.doc.name, + mt940_file_path: frm.doc.import_file, + }, + }) + .then((r) => { + const file_url = r.message; + frm.set_value("import_file", file_url); + frm.save(); + }); + } }, - error_handlers: { - TimestampMismatchError() { - // ignore this error - }, + () => { + frm.call({ + method: "get_preview_from_template", + args: { + data_import: frm.doc.name, + import_file: frm.doc.import_file, + google_sheets_url: frm.doc.google_sheets_url, + }, + error_handlers: { + TimestampMismatchError() { + // ignore this error + }, + }, + }).then((r) => { + let preview_data = r.message; + frm.events.show_import_preview(frm, preview_data); + frm.events.show_import_warnings(frm, preview_data); + }); }, - }).then((r) => { - let preview_data = r.message; - frm.events.show_import_preview(frm, preview_data); - frm.events.show_import_warnings(frm, preview_data); - }); + ]); }, // method: 'frappe.core.doctype.data_import.data_import.get_preview_from_template', diff --git a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json index 500e36a8782..c70092b765e 100644 --- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json +++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json @@ -11,6 +11,7 @@ "bank_account", "bank", "column_break_4", + "import_mt940_fromat", "custom_delimiters", "delimiter_options", "google_sheets_url", @@ -20,6 +21,7 @@ "download_template", "status", "template_options", + "use_csv_sniffer", "import_warnings_section", "template_warnings", "import_warnings", @@ -207,14 +209,28 @@ "fieldname": "delimiter_options", "fieldtype": "Data", "label": "Delimiter options" + }, + { + "default": "0", + "fieldname": "use_csv_sniffer", + "fieldtype": "Check", + "hidden": 1, + "label": "Use CSV Sniffer" + }, + { + "default": "0", + "fieldname": "import_mt940_fromat", + "fieldtype": "Check", + "label": "Import MT940 Fromat" } ], "hide_toolbar": 1, "links": [], - "modified": "2024-06-25 17:32:07.658250", + "modified": "2025-06-11 02:23:22.159961", "modified_by": "Administrator", "module": "Accounts", "name": "Bank Statement Import", + "naming_rule": "Expression", "owner": "Administrator", "permissions": [ { @@ -230,8 +246,9 @@ "write": 1 } ], + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [], "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py index 90af63d4f10..1338b2dcf25 100644 --- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py +++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py @@ -3,15 +3,19 @@ import csv +import io import json import re +from datetime import date, datetime import frappe +import mt940 import openpyxl from frappe import _ from frappe.core.doctype.data_import.data_import import DataImport from frappe.core.doctype.data_import.importer import Importer, ImportFile from frappe.utils.background_jobs import enqueue +from frappe.utils.file_manager import get_file, save_file from frappe.utils.xlsxutils import ILLEGAL_CHARACTERS_RE, handle_html from openpyxl.styles import Font from openpyxl.utils import get_column_letter @@ -35,6 +39,7 @@ class BankStatementImport(DataImport): delimiter_options: DF.Data | None google_sheets_url: DF.Data | None import_file: DF.Attach | None + import_mt940_fromat: DF.Check import_type: DF.Literal["", "Insert New Records", "Update Existing Records"] mute_emails: DF.Check reference_doctype: DF.Link @@ -43,6 +48,7 @@ class BankStatementImport(DataImport): submit_after_import: DF.Check template_options: DF.Code | None template_warnings: DF.Code | None + use_csv_sniffer: DF.Check # end: auto-generated types def __init__(self, *args, **kwargs): @@ -65,8 +71,9 @@ class BankStatementImport(DataImport): self.template_warnings = "" - self.validate_import_file() - self.validate_google_sheets_url() + if self.import_file and not self.import_file.lower().endswith(".txt"): + self.validate_import_file() + self.validate_google_sheets_url() def start_import(self): preview = frappe.get_doc("Bank Statement Import", self.name).get_preview_from_template( @@ -104,6 +111,68 @@ class BankStatementImport(DataImport): return None +@frappe.whitelist() +def convert_mt940_to_csv(data_import, mt940_file_path): + doc = frappe.get_doc("Bank Statement Import", data_import) + + file_doc, content = get_file(mt940_file_path) + + if not is_mt940_format(content): + frappe.throw(_("The uploaded file does not appear to be in valid MT940 format.")) + + if is_mt940_format(content) and not doc.import_mt940_fromat: + frappe.throw(_("MT940 file detected. Please enable 'Import MT940 Format' to proceed.")) + + try: + transactions = mt940.parse(content) + except Exception as e: + frappe.throw(_("Failed to parse MT940 format. Error: {0}").format(str(e))) + + if not transactions: + frappe.throw(_("Parsed file is not in valid MT940 format or contains no transactions.")) + + # Use in-memory file buffer instead of writing to temp file + csv_buffer = io.StringIO() + writer = csv.writer(csv_buffer) + + headers = ["Date", "Deposit", "Withdrawal", "Description", "Reference Number", "Bank Account", "Currency"] + writer.writerow(headers) + + for txn in transactions: + txn_date = getattr(txn, "date", None) + raw_date = txn.data.get("date", "") + + if txn_date: + date_str = txn_date.strftime("%Y-%m-%d") + elif isinstance(raw_date, date | datetime): + date_str = raw_date.strftime("%Y-%m-%d") + else: + date_str = str(raw_date) + + raw_amount = str(txn.data.get("amount", "")) + parts = raw_amount.strip().split() + amount_value = float(parts[0]) if parts else 0.0 + + deposit = amount_value if amount_value > 0 else "" + withdrawal = abs(amount_value) if amount_value < 0 else "" + description = txn.data.get("extra_details") or "" + reference = txn.data.get("transaction_reference") or "" + currency = txn.data.get("currency", "") + + writer.writerow([date_str, deposit, withdrawal, description, reference, doc.bank_account, currency]) + + # Prepare in-memory CSV for upload + csv_content = csv_buffer.getvalue().encode("utf-8") + csv_buffer.close() + + filename = f"{frappe.utils.now_datetime().strftime('%Y%m%d%H%M%S')}_converted_mt940.csv" + + # Save to File Manager + saved_file = save_file(filename, csv_content, doc.doctype, doc.name, is_private=True, df="import_file") + + return saved_file.file_url + + @frappe.whitelist() def get_preview_from_template(data_import, import_file=None, google_sheets_url=None): return frappe.get_doc("Bank Statement Import", data_import).get_preview_from_template( @@ -128,6 +197,12 @@ def download_import_log(data_import_name): return frappe.get_doc("Bank Statement Import", data_import_name).download_import_log() +def is_mt940_format(content: str) -> bool: + """Check if the content has key MT940 tags""" + required_tags = [":20:", ":25:", ":28C:", ":61:"] + return all(tag in content for tag in required_tags) + + def parse_data_from_template(raw_data): data = [] diff --git a/pyproject.toml b/pyproject.toml index 3ac7fa07c27..c8f5908d6c6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,6 +22,9 @@ dependencies = [ # Not used directly - required by PyQRCode for PNG generation "pypng~=0.20220715.0", + + # MT940 parser for bank statements + "mt-940>=4.26.0" ] [build-system] From d05204a960e1bbe0c3530971537c04facd9097f6 Mon Sep 17 00:00:00 2001 From: Karuppasamy923 Date: Tue, 17 Jun 2025 13:29:08 +0530 Subject: [PATCH 3/7] fix: add party and party_name columns to trend reports --- .../purchase_order_trends.py | 2 +- erpnext/controllers/trends.py | 25 +++++++++++++------ .../quotation_trends/quotation_trends.py | 2 +- .../sales_order_trends/sales_order_trends.py | 2 +- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.py b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.py index d089473a16a..7398bb28736 100644 --- a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.py +++ b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.py @@ -24,7 +24,7 @@ def get_chart_data(data, conditions, filters): datapoints = [] - start = 2 if filters.get("based_on") in ["Item", "Supplier"] else 1 + start = 3 if filters.get("based_on") in ["Item", "Supplier"] else 1 if filters.get("group_by"): start += 1 diff --git a/erpnext/controllers/trends.py b/erpnext/controllers/trends.py index 7e6062d34b2..57edae7053a 100644 --- a/erpnext/controllers/trends.py +++ b/erpnext/controllers/trends.py @@ -98,9 +98,10 @@ def get_data(filters, conditions): sel_col = "t1.supplier" if filters.get("based_on") in ["Item", "Customer", "Supplier"]: - inc = 2 + inc = 3 else: inc = 1 + data1 = frappe.db.sql( """ select {} from `tab{}` t1, `tab{} Item` t2 {} where t2.parent = t1.name and t1.company = {} and {} between {} and {} and @@ -330,11 +331,20 @@ def based_wise_columns_query(based_on, trans): based_on_details["addl_tables"] = "" elif based_on == "Customer": - based_on_details["based_on_cols"] = [ - "Customer:Link/Customer:120", - "Territory:Link/Territory:120", - ] - based_on_details["based_on_select"] = "t1.customer_name, t1.territory, " + if trans == "Quotation": + based_on_details["based_on_cols"] = [ + "Party:Link/Customer:120", + "Party Name:Data:120", + "Territory:Link/Territory:120", + ] + based_on_details["based_on_select"] = "t1.party_name, t1.customer_name, t1.territory," + else: + based_on_details["based_on_cols"] = [ + "Customer:Link/Customer:120", + "Customer Name:Data:120", + "Territory:Link/Territory:120", + ] + based_on_details["based_on_select"] = "t1.customer, t1.customer_name, t1.territory," based_on_details["based_on_group_by"] = "t1.party_name" if trans == "Quotation" else "t1.customer" based_on_details["addl_tables"] = "" @@ -347,9 +357,10 @@ def based_wise_columns_query(based_on, trans): elif based_on == "Supplier": based_on_details["based_on_cols"] = [ "Supplier:Link/Supplier:120", + "Supplier Name:Data:120", "Supplier Group:Link/Supplier Group:140", ] - based_on_details["based_on_select"] = "t1.supplier, t3.supplier_group," + based_on_details["based_on_select"] = "t1.supplier, t1.supplier_name, t3.supplier_group," based_on_details["based_on_group_by"] = "t1.supplier" based_on_details["addl_tables"] = ",`tabSupplier` t3" based_on_details["addl_tables_relational_cond"] = " and t1.supplier = t3.name" diff --git a/erpnext/selling/report/quotation_trends/quotation_trends.py b/erpnext/selling/report/quotation_trends/quotation_trends.py index bcb8fe9297e..5f96e07f541 100644 --- a/erpnext/selling/report/quotation_trends/quotation_trends.py +++ b/erpnext/selling/report/quotation_trends/quotation_trends.py @@ -25,7 +25,7 @@ def get_chart_data(data, conditions, filters): datapoints = [] - start = 2 if filters.get("based_on") in ["Item", "Customer"] else 1 + start = 3 if filters.get("based_on") in ["Item", "Customer"] else 1 if filters.get("group_by"): start += 1 diff --git a/erpnext/selling/report/sales_order_trends/sales_order_trends.py b/erpnext/selling/report/sales_order_trends/sales_order_trends.py index 18f448c7cd2..fdd63cd5a68 100644 --- a/erpnext/selling/report/sales_order_trends/sales_order_trends.py +++ b/erpnext/selling/report/sales_order_trends/sales_order_trends.py @@ -24,7 +24,7 @@ def get_chart_data(data, conditions, filters): datapoints = [] - start = 2 if filters.get("based_on") in ["Item", "Customer"] else 1 + start = 3 if filters.get("based_on") in ["Item", "Customer"] else 1 if filters.get("group_by"): start += 1 From a29ae9cf90b4105f0642b9817a417da387b87731 Mon Sep 17 00:00:00 2001 From: Karuppasamy923 Date: Sat, 21 Jun 2025 14:06:59 +0530 Subject: [PATCH 4/7] fix: add is_group filter for warehouse --- erpnext/selling/doctype/sales_order/sales_order.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 3e315c63f7a..78c5d29f7bc 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -181,14 +181,20 @@ frappe.ui.form.on("Sales Order", { } erpnext.queries.setup_queries(frm, "Warehouse", function () { return { - filters: [["Warehouse", "company", "in", ["", cstr(frm.doc.company)]]], + filters: [ + ["Warehouse", "company", "in", ["", cstr(frm.doc.company)]], + ["Warehouse", "is_group", "=", 0], + ], }; }); frm.set_query("warehouse", "items", function (doc, cdt, cdn) { let row = locals[cdt][cdn]; let query = { - filters: [["Warehouse", "company", "in", ["", cstr(frm.doc.company)]]], + filters: [ + ["Warehouse", "company", "in", ["", cstr(frm.doc.company)]], + ["Warehouse", "is_group", "=", 0], + ], }; if (row.item_code) { query.query = "erpnext.controllers.queries.warehouse_query"; From 938be22ae9f12d8577fe61e3278dc046063f9901 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 17 Jun 2025 16:10:08 +0530 Subject: [PATCH 5/7] feat: periodic accounting --- .../doctype/journal_entry/journal_entry.js | 33 ++++++++ .../doctype/journal_entry/journal_entry.json | 53 +++++++++++-- .../doctype/journal_entry/journal_entry.py | 78 +++++++++++++++++++ .../doctype/stock_entry/test_stock_entry.py | 69 ++++++++++++++++ 4 files changed, 228 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index 7df92066980..25b09583d57 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -20,6 +20,39 @@ frappe.ui.form.on("Journal Entry", { "Unreconcile Payment Entries", "Bank Transaction", ]; + + frm.trigger("set_queries"); + }, + + set_queries(frm) { + frm.set_query("periodic_entry_difference_account", function () { + return { + filters: { + is_group: 0, + company: frm.doc.company, + }, + }; + }); + + frm.set_query("stock_asset_account", function () { + return { + filters: { + is_group: 0, + account_type: "Stock", + company: frm.doc.company, + }, + }; + }); + }, + + get_balance_for_periodic_accounting(frm) { + frm.call({ + method: "get_balance_for_periodic_accounting", + doc: frm.doc, + callback: function (r) { + refresh_field("accounts"); + }, + }); }, refresh: function (frm) { diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json index c7430dbf00c..74e20cebb9d 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.json +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json @@ -13,15 +13,21 @@ "title", "voucher_type", "naming_series", - "finance_book", "process_deferred_accounting", "reversal_of", - "tax_withholding_category", "column_break1", "from_template", "company", "posting_date", + "finance_book", "apply_tds", + "tax_withholding_category", + "section_break_tcvw", + "for_all_stock_asset_accounts", + "column_break_wpau", + "stock_asset_account", + "periodic_entry_difference_account", + "get_balance_for_periodic_accounting", "2_add_edit_gl_entries", "accounts", "section_break99", @@ -89,7 +95,7 @@ "label": "Entry Type", "oldfieldname": "voucher_type", "oldfieldtype": "Select", - "options": "Journal Entry\nInter Company Journal Entry\nBank Entry\nCash Entry\nCredit Card Entry\nDebit Note\nCredit Note\nContra Entry\nExcise Entry\nWrite Off Entry\nOpening Entry\nDepreciation Entry\nAsset Disposal\nExchange Rate Revaluation\nExchange Gain Or Loss\nDeferred Revenue\nDeferred Expense", + "options": "Journal Entry\nInter Company Journal Entry\nBank Entry\nCash Entry\nCredit Card Entry\nDebit Note\nCredit Note\nContra Entry\nExcise Entry\nWrite Off Entry\nOpening Entry\nDepreciation Entry\nAsset Disposal\nPeriodic Accounting Entry\nExchange Rate Revaluation\nExchange Gain Or Loss\nDeferred Revenue\nDeferred Expense", "reqd": 1, "search_index": 1 }, @@ -543,6 +549,42 @@ "label": "Is System Generated", "no_copy": 1, "read_only": 1 + }, + { + "depends_on": "eval:doc.voucher_type === \"Periodic Accounting Entry\"", + "fieldname": "periodic_entry_difference_account", + "fieldtype": "Link", + "label": "Periodic Entry Difference Account", + "mandatory_depends_on": "eval:doc.voucher_type === \"Periodic Accounting Entry\"", + "options": "Account" + }, + { + "depends_on": "eval:doc.voucher_type === \"Periodic Accounting Entry\"", + "fieldname": "section_break_tcvw", + "fieldtype": "Section Break", + "label": "Periodic Accounting" + }, + { + "default": "1", + "fieldname": "for_all_stock_asset_accounts", + "fieldtype": "Check", + "label": "For All Stock Asset Accounts" + }, + { + "depends_on": "eval:doc.for_all_stock_asset_accounts === 0", + "fieldname": "stock_asset_account", + "fieldtype": "Link", + "label": "Stock Asset Account", + "options": "Account" + }, + { + "fieldname": "column_break_wpau", + "fieldtype": "Column Break" + }, + { + "fieldname": "get_balance_for_periodic_accounting", + "fieldtype": "Button", + "label": "Get Balance" } ], "icon": "fa fa-file-text", @@ -557,7 +599,7 @@ "table_fieldname": "payment_entries" } ], - "modified": "2024-12-26 15:32:20.730666", + "modified": "2025-06-17 15:18:13.322681", "modified_by": "Administrator", "module": "Accounts", "name": "Journal Entry", @@ -602,10 +644,11 @@ "role": "Auditor" } ], + "row_format": "Dynamic", "search_fields": "voucher_type,posting_date, due_date, cheque_no", "sort_field": "creation", "sort_order": "DESC", "states": [], "title_field": "title", "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index de67a3974b0..57eb24cbf8d 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -62,6 +62,7 @@ class JournalEntry(AccountsController): difference: DF.Currency due_date: DF.Date | None finance_book: DF.Link | None + for_all_stock_asset_accounts: DF.Check from_template: DF.Link | None inter_company_journal_entry_reference: DF.Link | None is_opening: DF.Literal["No", "Yes"] @@ -73,11 +74,13 @@ class JournalEntry(AccountsController): paid_loan: DF.Data | None pay_to_recd_from: DF.Data | None payment_order: DF.Link | None + periodic_entry_difference_account: DF.Link | None posting_date: DF.Date process_deferred_accounting: DF.Link | None remark: DF.SmallText | None reversal_of: DF.Link | None select_print_heading: DF.Link | None + stock_asset_account: DF.Link | None stock_entry: DF.Link | None tax_withholding_category: DF.Link | None title: DF.Data | None @@ -101,6 +104,7 @@ class JournalEntry(AccountsController): "Opening Entry", "Depreciation Entry", "Asset Disposal", + "Periodic Accounting Entry", "Exchange Rate Revaluation", "Exchange Gain Or Loss", "Deferred Revenue", @@ -198,6 +202,76 @@ class JournalEntry(AccountsController): self.update_inter_company_jv() self.update_invoice_discounting() + @frappe.whitelist() + def get_balance_for_periodic_accounting(self): + self.validate_company_for_periodic_accounting() + + stock_accounts = self.get_stock_accounts_for_periodic_accounting() + self.set("accounts", []) + for account in stock_accounts: + account_bal, stock_bal, warehouse_list = get_stock_and_account_balance( + account, self.posting_date, self.company + ) + + difference_value = flt(stock_bal - account_bal, self.precision("difference")) + + if difference_value == 0: + frappe.msgprint( + _("No difference found for stock account {0}").format(frappe.bold(account)), + alert=True, + ) + continue + + self.append( + "accounts", + { + "account": account, + "debit_in_account_currency": difference_value if difference_value > 0 else 0, + "credit_in_account_currency": abs(difference_value) if difference_value < 0 else 0, + }, + ) + + self.append( + "accounts", + { + "account": self.periodic_entry_difference_account, + "credit_in_account_currency": difference_value if difference_value > 0 else 0, + "debit_in_account_currency": abs(difference_value) if difference_value < 0 else 0, + }, + ) + + def validate_company_for_periodic_accounting(self): + if erpnext.is_perpetual_inventory_enabled(self.company): + frappe.throw( + _( + "Periodic Accounting Entry is not allowed for company {0} with perpetual inventory enabled" + ).format(self.company) + ) + + if not self.periodic_entry_difference_account: + frappe.throw(_("Please select Periodic Accounting Entry Difference Account")) + + def get_stock_accounts_for_periodic_accounting(self): + if self.voucher_type != "Periodic Accounting Entry": + return [] + + if self.for_all_stock_asset_accounts: + return frappe.get_all( + "Account", + filters={ + "company": self.company, + "account_type": "Stock", + "root_type": "Asset", + "is_group": 0, + }, + pluck="name", + ) + + if not self.stock_asset_account: + frappe.throw(_("Please select Stock Asset Account")) + + return [self.stock_asset_account] + def on_update_after_submit(self): # Flag will be set on Reconciliation # Reconciliation tool will anyways repost ledger entries. So, no need to check and do implicit repost. @@ -280,6 +354,10 @@ class JournalEntry(AccountsController): frappe.throw(_("Account {0} should be of type Expense").format(d.account)) def validate_stock_accounts(self): + if self.voucher_type == "Periodic Accounting Entry": + # Skip validation for periodic accounting entry + return + stock_accounts = get_stock_accounts(self.company, accounts=self.accounts) for account in stock_accounts: account_bal, stock_bal, warehouse_list = get_stock_and_account_balance( diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index 0ae619b3049..5140ef3b481 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -2016,6 +2016,75 @@ class TestStockEntry(IntegrationTestCase): self.assertEqual(se.items[0].basic_rate, 300) + def test_periodic_accounting_entries(self): + item_code = "_Test Periodic Accounting Item" + make_item(item_code, {"is_stock_item": 1}) + + company = "_Test Periodic Accounting Company" + + frappe.get_doc( + { + "doctype": "Company", + "company_name": company, + "abbr": "_TPC", + "default_currency": "INR", + "enable_perpetual_inventory": 0, + } + ).insert(ignore_permissions=True) + + warehouse = frappe.db.get_value("Warehouse", {"company": company, "is_group": 0}, "name") + + make_stock_entry( + item_code=item_code, + qty=10, + to_warehouse=warehouse, + basic_rate=100, + posting_date=add_days(nowdate(), -2), + ) + + jv = frappe.new_doc("Journal Entry") + jv.voucher_type = "Periodic Accounting Entry" + jv.posting_date = add_days(nowdate(), -1) + jv.posting_time = nowtime() + jv.company = company + jv.for_all_stock_asset_accounts = 1 + jv.periodic_entry_difference_account = "Stock Adjustment - _TPC" + jv.get_balance_for_periodic_accounting() + jv.save() + jv.submit() + + self.assertEqual(len(jv.accounts), 2) + self.assertEqual(jv.accounts[0].debit_in_account_currency, 1000) + self.assertEqual(jv.accounts[1].credit_in_account_currency, 1000) + self.assertEqual(jv.accounts[0].account, "Stock In Hand - _TPC") + self.assertEqual(jv.accounts[1].account, "Stock Adjustment - _TPC") + + make_stock_entry( + item_code=item_code, + qty=5, + from_warehouse=warehouse, + company=company, + posting_date=nowdate(), + posting_time=nowtime(), + ) + + jv = frappe.new_doc("Journal Entry") + jv.voucher_type = "Periodic Accounting Entry" + jv.posting_date = nowdate() + jv.posting_time = nowtime() + jv.company = company + jv.for_all_stock_asset_accounts = 1 + jv.periodic_entry_difference_account = "Stock Adjustment - _TPC" + jv.get_balance_for_periodic_accounting() + jv.save() + jv.submit() + + self.assertEqual(len(jv.accounts), 2) + self.assertEqual(jv.accounts[0].credit_in_account_currency, 500) + self.assertEqual(jv.accounts[1].debit_in_account_currency, 500) + self.assertEqual(jv.accounts[0].account, "Stock In Hand - _TPC") + self.assertEqual(jv.accounts[1].account, "Stock Adjustment - _TPC") + def make_serialized_item(self, **args): args = frappe._dict(args) From 0769174206390dcf5511de5b6ca9c71d0300185a Mon Sep 17 00:00:00 2001 From: MochaMind Date: Sun, 22 Jun 2025 17:21:36 +0530 Subject: [PATCH 6/7] chore: update POT file (#48189) --- erpnext/locale/main.pot | 2076 +++++++++++++++++++++------------------ 1 file changed, 1105 insertions(+), 971 deletions(-) diff --git a/erpnext/locale/main.pot b/erpnext/locale/main.pot index 545d2db40cb..1ec3721662f 100644 --- a/erpnext/locale/main.pot +++ b/erpnext/locale/main.pot @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: ERPNext VERSION\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2025-06-15 09:36+0000\n" -"PO-Revision-Date: 2025-06-15 09:36+0000\n" +"POT-Creation-Date: 2025-06-22 09:36+0000\n" +"PO-Revision-Date: 2025-06-22 09:36+0000\n" "Last-Translator: hello@frappe.io\n" "Language-Team: hello@frappe.io\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.13.1\n" +"Generated-By: Babel 2.16.0\n" #. Label of the column_break_32 (Column Break) field in DocType 'Email Digest' #: erpnext/setup/doctype/email_digest/email_digest.json @@ -136,6 +136,11 @@ msgstr "" msgid "% Completed" msgstr "" +#. Label of the per_delivered (Percent) field in DocType 'Pick List' +#: erpnext/stock/doctype/pick_list/pick_list.json +msgid "% Delivered" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.js:892 #, python-format msgid "% Finished Item Quantity" @@ -205,6 +210,12 @@ msgstr "" msgid "% of materials billed against this Sales Order" msgstr "" +#. Description of the '% Delivered' (Percent) field in DocType 'Pick List' +#: erpnext/stock/doctype/pick_list/pick_list.json +#, python-format +msgid "% of materials delivered against this Pick List" +msgstr "" + #. Description of the '% Delivered' (Percent) field in DocType 'Sales Order' #: erpnext/selling/doctype/sales_order/sales_order.json #, python-format @@ -231,7 +242,7 @@ msgstr "" msgid "'Default {0} Account' in Company {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1196 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1274 msgid "'Entries' cannot be empty" msgstr "" @@ -1150,7 +1161,7 @@ msgstr "" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:788 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:789 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "" @@ -1214,7 +1225,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:30 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:190 #: erpnext/accounts/report/general_ledger/general_ledger.js:38 -#: erpnext/accounts/report/general_ledger/general_ledger.py:640 +#: erpnext/accounts/report/general_ledger/general_ledger.py:641 #: 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 @@ -1380,7 +1391,7 @@ msgstr "" #. Label of the account_type (Select) field in DocType 'Party Type' #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/account.py:202 -#: erpnext/accounts/doctype/account/account_tree.js:153 +#: erpnext/accounts/doctype/account/account_tree.js:158 #: erpnext/accounts/doctype/bank_account/bank_account.json #: erpnext/accounts/doctype/bank_account_type/bank_account_type.json #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json @@ -1421,7 +1432,7 @@ msgstr "" msgid "Account is not set for the dashboard chart {0}" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:758 +#: erpnext/assets/doctype/asset/asset.py:755 msgid "Account not Found" msgstr "" @@ -1494,7 +1505,7 @@ msgstr "" msgid "Account {0} is invalid. Account Currency must be {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:280 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:354 msgid "Account {0} should be of type Expense" msgstr "" @@ -1518,7 +1529,7 @@ msgstr "" msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:291 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:369 msgid "Account: {0} can only be updated via Stock Transactions" msgstr "" @@ -1799,31 +1810,40 @@ msgstr "" msgid "Accounting Entries" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:792 -#: erpnext/assets/doctype/asset/asset.py:807 -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:554 +#: erpnext/assets/doctype/asset/asset.py:789 +#: erpnext/assets/doctype/asset/asset.py:804 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:559 msgid "Accounting Entry for Asset" msgstr "" +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1673 +msgid "Accounting Entry for LCV in Stock Entry {0}" +msgstr "" + +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:755 +msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" +msgstr "" + #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:805 msgid "Accounting Entry for Service" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:998 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1019 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1037 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1058 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1079 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1103 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1210 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1446 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1468 -#: erpnext/controllers/stock_controller.py:572 -#: erpnext/controllers/stock_controller.py:589 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:997 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1018 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1036 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1057 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1078 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1102 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1209 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1445 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1467 +#: erpnext/controllers/stock_controller.py:577 +#: erpnext/controllers/stock_controller.py:594 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:898 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1586 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1600 -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:607 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1599 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1613 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:613 msgid "Accounting Entry for Stock" msgstr "" @@ -2181,7 +2201,7 @@ msgstr "" msgid "Accounts User" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1295 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1373 msgid "Accounts table cannot be blank." msgstr "" @@ -2220,7 +2240,7 @@ msgstr "" msgid "Accumulated Depreciation as on" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:254 +#: erpnext/accounts/doctype/budget/budget.py:251 msgid "Accumulated Monthly" msgstr "" @@ -2361,7 +2381,7 @@ msgstr "" #: erpnext/accounts/doctype/account/account.js:56 #: erpnext/accounts/doctype/account/account.js:88 #: erpnext/accounts/doctype/account/account.js:116 -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:53 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:86 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:254 #: erpnext/accounts/doctype/subscription/subscription.js:38 #: erpnext/accounts/doctype/subscription/subscription.js:44 @@ -2674,7 +2694,7 @@ msgstr "" msgid "Add / Edit Prices" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:243 +#: erpnext/accounts/doctype/account/account_tree.js:248 msgid "Add Child" msgstr "" @@ -2850,7 +2870,7 @@ msgid "Add details" msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.js:78 -#: erpnext/stock/doctype/pick_list/pick_list.py:827 +#: erpnext/stock/doctype/pick_list/pick_list.py:854 msgid "Add items in the Item Locations table" msgstr "" @@ -3463,7 +3483,7 @@ msgstr "" msgid "Advance amount cannot be greater than {0} {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:865 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943 msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}" msgstr "" @@ -3520,7 +3540,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:710 msgid "Against Account" msgstr "" @@ -3589,7 +3609,7 @@ msgstr "" msgid "Against Income Account" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:805 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:773 msgid "Against Journal Entry {0} does not have any unmatched {1} entry" msgstr "" @@ -3598,6 +3618,11 @@ msgstr "" msgid "Against Journal Entry {0} is already adjusted against some other voucher" msgstr "" +#. Label of the against_pick_list (Link) field in DocType 'Delivery Note Item' +#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json +msgid "Against Pick List" +msgstr "" + #. Label of the against_sales_invoice (Link) field in DocType 'Delivery Note #. Item' #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -3626,13 +3651,13 @@ msgstr "" msgid "Against Stock Entry" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:328 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:327 msgid "Against Supplier Invoice {0}" msgstr "" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:729 +#: erpnext/accounts/report/general_ledger/general_ledger.py:730 msgid "Against Voucher" msgstr "" @@ -3656,7 +3681,7 @@ msgstr "" #: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:728 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:177 msgid "Against Voucher Type" msgstr "" @@ -3670,7 +3695,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:152 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:133 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1129 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1130 msgid "Age (Days)" msgstr "" @@ -3783,7 +3808,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:1422 erpnext/public/js/setup_wizard.js:180 +#: erpnext/accounts/utils.py:1422 erpnext/public/js/setup_wizard.js:184 msgid "All Accounts" msgstr "" @@ -3947,15 +3972,15 @@ msgstr "" msgid "All items are already requested" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1324 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1326 msgid "All items have already been Invoiced/Returned" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:1151 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:1165 msgid "All items have already been received" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2554 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2624 msgid "All items have already been transferred for this Work Order." msgstr "" @@ -3973,11 +3998,11 @@ msgstr "" msgid "All the items have been already returned." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1074 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1067 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:825 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:839 msgid "All these items have already been Invoiced/Returned" msgstr "" @@ -4229,6 +4254,12 @@ msgstr "" msgid "Allow Partial Reservation" msgstr "" +#. Label of the allow_pegged_currencies_exchange_rates (Check) field in DocType +#. 'Accounts Settings' +#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json +msgid "Allow Pegged Currencies Exchange Rates" +msgstr "" + #. Label of the allow_production_on_holidays (Check) field in DocType #. 'Manufacturing Settings' #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json @@ -4497,7 +4528,7 @@ msgstr "" msgid "Allows users to submit Supplier Quotations with zero quantity. Useful when rates are fixed but the quantities are not. Eg. Rate Contracts." msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:969 +#: erpnext/stock/doctype/pick_list/pick_list.py:996 msgid "Already Picked" msgstr "" @@ -4514,8 +4545,8 @@ msgid "Also you can't switch back to FIFO after setting the valuation method to msgstr "" #: erpnext/manufacturing/doctype/bom/bom.js:200 -#: erpnext/manufacturing/doctype/work_order/work_order.js:140 -#: erpnext/manufacturing/doctype/work_order/work_order.js:155 +#: erpnext/manufacturing/doctype/work_order/work_order.js:151 +#: erpnext/manufacturing/doctype/work_order/work_order.js:166 #: erpnext/public/js/utils.js:508 #: erpnext/stock/doctype/stock_entry/stock_entry.js:253 msgid "Alternate Item" @@ -4771,6 +4802,8 @@ msgstr "" #. Label of the amount (Currency) field in DocType 'Purchase Receipt Item #. Supplied' #. Label of the amount (Currency) field in DocType 'Supplier Quotation Item' +#. Option for the 'Margin Type' (Select) field in DocType 'Supplier Quotation +#. Item' #. Label of the amount (Currency) field in DocType 'Opportunity Item' #. Label of the amount (Currency) field in DocType 'Prospect Opportunity' #. Label of the amount_section (Section Break) field in DocType 'BOM Creator @@ -4815,7 +4848,7 @@ msgstr "" #: erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.json #: erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:554 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:587 #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json @@ -5095,7 +5128,7 @@ msgstr "" msgid "Analytics" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:238 +#: erpnext/accounts/doctype/budget/budget.py:235 msgid "Annual" msgstr "" @@ -5608,7 +5641,7 @@ msgstr "" msgid "As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}." msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1738 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1739 msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}." msgstr "" @@ -5858,7 +5891,7 @@ msgstr "" msgid "Asset Movement Item" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:1039 +#: erpnext/assets/doctype/asset/asset.py:1035 msgid "Asset Movement record {0} created" msgstr "" @@ -5991,7 +6024,7 @@ msgstr "" msgid "Asset cancelled" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:587 +#: erpnext/assets/doctype/asset/asset.py:584 msgid "Asset cannot be cancelled, as it is already {0}" msgstr "" @@ -5999,23 +6032,19 @@ msgstr "" msgid "Asset cannot be scrapped before the last depreciation entry." msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:646 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:609 msgid "Asset capitalized after Asset Capitalization {0} was submitted" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:220 +#: erpnext/assets/doctype/asset/asset.py:217 msgid "Asset created" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:590 -msgid "Asset created after Asset Capitalization {0} was submitted" -msgstr "" - -#: erpnext/assets/doctype/asset/asset.py:1279 +#: erpnext/assets/doctype/asset/asset.py:1275 msgid "Asset created after being split from Asset {0}" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:223 +#: erpnext/assets/doctype/asset/asset.py:220 msgid "Asset deleted" msgstr "" @@ -6035,7 +6064,7 @@ msgstr "" msgid "Asset restored" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:654 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:617 msgid "Asset restored after Asset Capitalization {0} was cancelled" msgstr "" @@ -6064,7 +6093,7 @@ msgstr "" msgid "Asset transferred to Location {0}" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:1288 +#: erpnext/assets/doctype/asset/asset.py:1284 msgid "Asset updated after being split into Asset {0}" msgstr "" @@ -6076,7 +6105,7 @@ msgstr "" msgid "Asset {0} cannot be scrapped, as it is already {1}" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:216 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:214 msgid "Asset {0} does not belong to Item {1}" msgstr "" @@ -6092,16 +6121,12 @@ msgstr "" msgid "Asset {0} does not belongs to the location {1}" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:706 -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:798 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:669 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:761 msgid "Asset {0} does not exist" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:596 -msgid "Asset {0} has been created. Please set the depreciation details if any and submit it." -msgstr "" - -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:620 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:583 msgid "Asset {0} has been updated. Please set the depreciation details if any and submit it." msgstr "" @@ -6109,7 +6134,7 @@ msgstr "" msgid "Asset {0} must be submitted" msgstr "" -#: erpnext/controllers/buying_controller.py:913 +#: erpnext/controllers/buying_controller.py:901 msgid "Asset {assets_link} created for {item_code}" msgstr "" @@ -6139,15 +6164,15 @@ msgstr "" msgid "Assets" msgstr "" -#: erpnext/controllers/buying_controller.py:931 +#: erpnext/controllers/buying_controller.py:919 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "" -#: erpnext/controllers/buying_controller.py:918 +#: erpnext/controllers/buying_controller.py:906 msgid "Assets {assets_link} created for {item_code}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:153 +#: erpnext/manufacturing/doctype/job_card/job_card.js:152 msgid "Assign Job to Employee" msgstr "" @@ -6185,11 +6210,11 @@ msgstr "" msgid "Associate" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:101 +#: erpnext/stock/doctype/pick_list/pick_list.py:104 msgid "At Row #{0}: The picked quantity {1} for the item {2} is greater than available stock {3} for the batch {4} in the warehouse {5}. Please restock the item." msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:126 +#: erpnext/stock/doctype/pick_list/pick_list.py:129 msgid "At Row #{0}: The picked quantity {1} for the item {2} is greater than available stock {3} in the warehouse {4}." msgstr "" @@ -6197,7 +6222,7 @@ msgstr "" msgid "At least one account with exchange gain or loss is required" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:1145 +#: erpnext/assets/doctype/asset/asset.py:1141 msgid "At least one asset has to be selected." msgstr "" @@ -6222,11 +6247,11 @@ msgstr "" msgid "At least one of the Selling or Buying must be selected" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:622 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:623 msgid "At least one warehouse is mandatory" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:542 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:543 msgid "At row #{0}: the Difference Account must not be a Stock type account, please change the Account Type for the account {1} or select a different account" msgstr "" @@ -6234,11 +6259,11 @@ msgstr "" msgid "At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:550 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:551 msgid "At row #{0}: you have selected the Difference Account {1}, which is a Cost of Goods Sold type account. Please select a different account" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:865 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:914 msgid "At row {0}: Batch No is mandatory for Item {1}" msgstr "" @@ -6246,15 +6271,15 @@ msgstr "" msgid "At row {0}: Parent Row No cannot be set for item {1}" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:850 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:899 msgid "At row {0}: Qty is mandatory for the batch {1}" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:857 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:906 msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:526 +#: erpnext/controllers/stock_controller.py:531 msgid "At row {0}: Serial and Batch Bundle {1} has already created. Please remove the values from the serial no or batch no fields." msgstr "" @@ -6749,11 +6774,11 @@ msgstr "" msgid "Available Stock for Packing Items" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:316 +#: erpnext/assets/doctype/asset/asset.py:313 msgid "Available for use date is required" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:755 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:756 msgid "Available quantity is {0}, you need {1}" msgstr "" @@ -6766,7 +6791,7 @@ msgstr "" msgid "Available-for-use Date" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:421 +#: erpnext/assets/doctype/asset/asset.py:418 msgid "Available-for-use Date should be after purchase date" msgstr "" @@ -6868,7 +6893,7 @@ msgstr "" #: erpnext/manufacturing/doctype/bom/bom.json #: erpnext/manufacturing/doctype/bom/bom_tree.js:8 #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:191 +#: erpnext/manufacturing/doctype/work_order/work_order.js:202 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/report/bom_explorer/bom_explorer.js:8 #: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:57 @@ -6877,7 +6902,7 @@ msgstr "" #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:109 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/selling/doctype/sales_order/sales_order.js:993 -#: erpnext/stock/doctype/material_request/material_request.js:315 +#: erpnext/stock/doctype/material_request/material_request.js:321 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/stock/doctype/stock_entry/stock_entry.js:631 #: erpnext/stock/report/bom_search/bom_search.py:38 @@ -7119,7 +7144,7 @@ msgstr "" msgid "BOM and Production" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:347 +#: erpnext/stock/doctype/material_request/material_request.js:353 #: erpnext/stock/doctype/stock_entry/stock_entry.js:683 msgid "BOM does not contain any stock item" msgstr "" @@ -7177,7 +7202,7 @@ msgstr "" #. Order Operation' #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json #: erpnext/manufacturing/doctype/job_card/job_card.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:331 +#: erpnext/manufacturing/doctype/work_order/work_order.js:342 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "Backflush Materials From WIP Warehouse" msgstr "" @@ -7215,7 +7240,7 @@ msgstr "" msgid "Balance (Dr - Cr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:661 +#: erpnext/accounts/report/general_ledger/general_ledger.py:662 msgid "Balance ({0})" msgstr "" @@ -7357,7 +7382,7 @@ msgstr "" #: erpnext/accounts/report/cheques_and_deposits_incorrectly_cleared/cheques_and_deposits_incorrectly_cleared.js:16 #: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/buying/doctype/supplier/supplier.js:108 -#: erpnext/setup/setup_wizard/operations/install_fixtures.py:513 +#: erpnext/setup/setup_wizard/operations/install_fixtures.py:514 msgid "Bank Account" msgstr "" @@ -7556,7 +7581,7 @@ msgstr "" msgid "Bank Transaction {0} updated" msgstr "" -#: erpnext/setup/setup_wizard/operations/install_fixtures.py:546 +#: erpnext/setup/setup_wizard/operations/install_fixtures.py:547 msgid "Bank account cannot be named as {0}" msgstr "" @@ -7905,11 +7930,11 @@ msgstr "" msgid "Batch No" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:868 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:917 msgid "Batch No is mandatory" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2630 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2677 msgid "Batch No {0} does not exists" msgstr "" @@ -7917,7 +7942,7 @@ msgstr "" msgid "Batch No {0} is linked with Item {1} which has serial no. Please scan serial no instead." msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:365 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:381 msgid "Batch No {0} is not present in the original {1} {2}, hence you can't return it against the {1} {2}" msgstr "" @@ -7932,7 +7957,7 @@ msgstr "" msgid "Batch Nos" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1422 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1469 msgid "Batch Nos are created successfully" msgstr "" @@ -7960,7 +7985,7 @@ msgstr "" #. Label of the batch_size (Float) field in DocType 'Work Order Operation' #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json #: erpnext/manufacturing/doctype/operation/operation.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:313 +#: erpnext/manufacturing/doctype/work_order/work_order.js:324 #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "Batch Size" @@ -7981,7 +8006,7 @@ msgstr "" msgid "Batch not created for item {} since it does not have a batch series." msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:256 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:319 msgid "Batch {0} and Warehouse" msgstr "" @@ -7989,12 +8014,12 @@ msgstr "" msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2717 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2787 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:283 msgid "Batch {0} of Item {1} has expired." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2723 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2793 msgid "Batch {0} of Item {1} is disabled." msgstr "" @@ -8035,7 +8060,7 @@ msgstr "" #. Label of the bill_date (Date) field in DocType 'Journal Entry' #. Label of the bill_date (Date) field in DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/journal_entry/journal_entry.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1114 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1115 #: erpnext/accounts/report/purchase_register/purchase_register.py:214 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "Bill Date" @@ -8044,7 +8069,7 @@ msgstr "" #. Label of the bill_no (Data) field in DocType 'Journal Entry' #. Label of the bill_no (Data) field in DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/journal_entry/journal_entry.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1113 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1114 #: erpnext/accounts/report/purchase_register/purchase_register.py:213 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "Bill No" @@ -8060,7 +8085,7 @@ msgstr "" #. Label of a Link in the Manufacturing Workspace #: erpnext/manufacturing/doctype/bom/bom.py:1177 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json -#: erpnext/stock/doctype/material_request/material_request.js:107 +#: erpnext/stock/doctype/material_request/material_request.js:113 #: erpnext/stock/doctype/stock_entry/stock_entry.js:613 msgid "Bill of Materials" msgstr "" @@ -8264,7 +8289,7 @@ msgstr "" msgid "Billing Zipcode" msgstr "" -#: erpnext/accounts/party.py:608 +#: erpnext/accounts/party.py:610 msgid "Billing currency must be equal to either default company's currency or party account currency" msgstr "" @@ -8720,8 +8745,8 @@ msgstr "" msgid "Budget Detail" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:302 -#: erpnext/accounts/doctype/budget/budget.py:304 +#: erpnext/accounts/doctype/budget/budget.py:299 +#: erpnext/accounts/doctype/budget/budget.py:301 #: erpnext/controllers/budget_controller.py:286 #: erpnext/controllers/budget_controller.py:289 msgid "Budget Exceeded" @@ -9232,7 +9257,7 @@ msgstr "" msgid "Can be approved by {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2071 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2073 msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state." msgstr "" @@ -9260,7 +9285,7 @@ msgstr "" msgid "Can not filter based on Voucher No, if grouped by Voucher" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1354 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1432 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2968 msgid "Can only make payment against unbilled {0}" msgstr "" @@ -9446,11 +9471,11 @@ msgstr "" msgid "Cannot Resubmit Ledger entries for vouchers in Closed fiscal year." msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:98 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:162 msgid "Cannot amend {0} {1}, please create a new one instead." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:305 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:383 msgid "Cannot apply TDS against multiple parties in one entry" msgstr "" @@ -9470,11 +9495,11 @@ msgstr "" msgid "Cannot cancel the transaction. Reposting of item valuation on submission is not completed yet." msgstr "" -#: erpnext/controllers/buying_controller.py:1021 +#: erpnext/controllers/buying_controller.py:1009 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:351 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:352 msgid "Cannot cancel transaction for Completed Work Order." msgstr "" @@ -9526,8 +9551,8 @@ msgstr "" msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1727 -#: erpnext/stock/doctype/pick_list/pick_list.py:184 +#: erpnext/selling/doctype/sales_order/sales_order.py:1733 +#: erpnext/stock/doctype/pick_list/pick_list.py:200 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "" @@ -9716,12 +9741,6 @@ msgstr "" msgid "Capital Work in Progress" msgstr "" -#. Label of the capitalization_method (Select) field in DocType 'Asset -#. Capitalization' -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json -msgid "Capitalization Method" -msgstr "" - #: erpnext/assets/doctype/asset/asset.js:203 msgid "Capitalize Asset" msgstr "" @@ -9817,7 +9836,7 @@ msgstr "" msgid "Cash In Hand" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:318 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:317 msgid "Cash or Bank Account is mandatory for making payment entry" msgstr "" @@ -10078,11 +10097,11 @@ msgstr "" msgid "Charges Incurred" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js:34 msgid "Charges are updated in Purchase Receipt against each item" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js:34 msgid "Charges will be distributed proportionately based on item qty or amount, as per your selection" msgstr "" @@ -10136,7 +10155,7 @@ msgid "Chart of Accounts Importer" msgstr "" #. Label of a Link in the Accounting Workspace -#: erpnext/accounts/doctype/account/account_tree.js:182 +#: erpnext/accounts/doctype/account/account_tree.js:187 #: erpnext/accounts/doctype/cost_center/cost_center.js:41 #: erpnext/accounts/workspace/accounting/accounting.json msgid "Chart of Cost Centers" @@ -10311,12 +10330,6 @@ msgstr "" msgid "Child warehouse exists for this warehouse. You can not delete this warehouse." msgstr "" -#. Option for the 'Capitalization Method' (Select) field in DocType 'Asset -#. Capitalization' -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json -msgid "Choose a WIP composite asset" -msgstr "" - #: erpnext/projects/doctype/task/task.py:231 msgid "Circular Reference Error" msgstr "" @@ -10427,16 +10440,16 @@ msgstr "" msgid "Client" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:374 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:388 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:54 #: erpnext/crm/doctype/opportunity/opportunity.js:125 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:121 -#: erpnext/manufacturing/doctype/work_order/work_order.js:684 +#: erpnext/manufacturing/doctype/work_order/work_order.js:677 #: erpnext/quality_management/doctype/quality_meeting/quality_meeting_list.js:7 #: erpnext/selling/doctype/sales_order/sales_order.js:585 #: erpnext/selling/doctype/sales_order/sales_order.js:617 #: erpnext/selling/doctype/sales_order/sales_order_list.js:66 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:270 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:319 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:276 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:170 #: erpnext/support/doctype/issue/issue.js:23 @@ -10540,7 +10553,7 @@ msgstr "" msgid "Closing (Dr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:379 +#: erpnext/accounts/report/general_ledger/general_ledger.py:380 msgid "Closing (Opening + Total)" msgstr "" @@ -10614,7 +10627,7 @@ msgstr "" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:144 #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:151 #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:194 -#: erpnext/public/js/setup_wizard.js:196 +#: erpnext/public/js/setup_wizard.js:200 msgid "Collapse All" msgstr "" @@ -10775,7 +10788,7 @@ msgstr "" msgid "Communication Medium Type" msgstr "" -#: erpnext/setup/install.py:93 +#: erpnext/setup/install.py:94 msgid "Compact Item Print" msgstr "" @@ -10955,7 +10968,7 @@ msgstr "" #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json #: erpnext/accounts/doctype/item_tax_template/item_tax_template.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:104 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:137 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json #: erpnext/accounts/doctype/ledger_health_monitor_company/ledger_health_monitor_company.json @@ -11217,7 +11230,7 @@ msgstr "" msgid "Company Abbreviation" msgstr "" -#: erpnext/public/js/setup_wizard.js:170 +#: erpnext/public/js/setup_wizard.js:174 msgid "Company Abbreviation cannot have more than 5 characters" msgstr "" @@ -11344,7 +11357,7 @@ msgstr "" msgid "Company Name" msgstr "" -#: erpnext/public/js/setup_wizard.js:73 +#: erpnext/public/js/setup_wizard.js:77 msgid "Company Name cannot be Company" msgstr "" @@ -11370,7 +11383,7 @@ msgstr "" msgid "Company currencies of both the companies should match for Inter Company Transactions." msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:341 +#: erpnext/stock/doctype/material_request/material_request.js:347 #: erpnext/stock/doctype/stock_entry/stock_entry.js:677 msgid "Company field is required" msgstr "" @@ -11391,7 +11404,7 @@ msgstr "" msgid "Company name not same" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:264 +#: erpnext/assets/doctype/asset/asset.py:261 msgid "Company of asset {0} and purchase document {1} doesn't matches." msgstr "" @@ -11471,7 +11484,7 @@ msgstr "" msgid "Complete" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:190 +#: erpnext/manufacturing/doctype/job_card/job_card.js:189 #: erpnext/manufacturing/doctype/workstation/workstation.js:151 msgid "Complete Job" msgstr "" @@ -11604,8 +11617,8 @@ msgstr "" msgid "Completed Qty cannot be greater than 'Qty to Manufacture'" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:238 -#: erpnext/manufacturing/doctype/job_card/job_card.js:334 +#: erpnext/manufacturing/doctype/job_card/job_card.js:237 +#: erpnext/manufacturing/doctype/job_card/job_card.js:332 #: erpnext/manufacturing/doctype/workstation/workstation.js:296 msgid "Completed Quantity" msgstr "" @@ -11959,11 +11972,7 @@ msgstr "" msgid "Consumed Stock Items" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:308 -msgid "Consumed Stock Items or Consumed Asset Items are mandatory for creating new composite asset" -msgstr "" - -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:315 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:304 msgid "Consumed Stock Items, Consumed Asset Items or Consumed Service Items is mandatory for Capitalization" msgstr "" @@ -12414,7 +12423,7 @@ msgstr "" msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "" -#: erpnext/controllers/stock_controller.py:77 +#: erpnext/controllers/stock_controller.py:78 msgid "Conversion factor for item {0} has been reset to 1.0 as the uom {1} is same as stock uom {2}." msgstr "" @@ -12497,13 +12506,13 @@ msgstr "" msgid "Corrective Action" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:391 +#: erpnext/manufacturing/doctype/job_card/job_card.js:389 msgid "Corrective Job Card" msgstr "" #. Label of the corrective_operation_section (Tab Break) field in DocType 'Job #. Card' -#: erpnext/manufacturing/doctype/job_card/job_card.js:398 +#: erpnext/manufacturing/doctype/job_card/job_card.js:396 #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "Corrective Operation" msgstr "" @@ -12641,13 +12650,13 @@ msgstr "" #: erpnext/accounts/report/accounts_payable/accounts_payable.js:28 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:40 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:30 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1100 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1101 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:40 #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:42 #: 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:723 #: 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:308 @@ -12734,7 +12743,7 @@ msgstr "" msgid "Cost Center is a part of Cost Center Allocation, hence cannot be converted to a group" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1411 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1410 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:864 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "" @@ -12755,11 +12764,11 @@ msgstr "" msgid "Cost Center {0} cannot be used for allocation as it is used as main cost center in other allocation record." msgstr "" -#: erpnext/assets/doctype/asset/asset.py:292 +#: erpnext/assets/doctype/asset/asset.py:289 msgid "Cost Center {} doesn't belong to Company {}" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:299 +#: erpnext/assets/doctype/asset/asset.py:296 msgid "Cost Center {} is a group cost center and group cost centers cannot be used in transactions" msgstr "" @@ -12798,7 +12807,7 @@ msgstr "" msgid "Cost of Goods Sold" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:553 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:554 msgid "Cost of Goods Sold Account in Items Table" msgstr "" @@ -12875,7 +12884,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:659 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:671 msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again" msgstr "" @@ -12994,7 +13003,7 @@ msgstr "" #: erpnext/accounts/doctype/dunning/dunning.js:55 #: erpnext/accounts/doctype/dunning/dunning.js:57 #: erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:34 -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:115 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:68 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109 @@ -13016,14 +13025,14 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:143 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:151 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:177 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:137 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:407 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:427 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:440 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:447 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:457 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:475 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:481 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:151 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:421 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:441 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:454 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:461 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:471 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:489 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:495 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:53 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:160 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:217 @@ -13055,10 +13064,10 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan/production_plan.js:137 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:151 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:157 -#: erpnext/manufacturing/doctype/work_order/work_order.js:195 -#: erpnext/manufacturing/doctype/work_order/work_order.js:210 -#: erpnext/manufacturing/doctype/work_order/work_order.js:355 -#: erpnext/manufacturing/doctype/work_order/work_order.js:940 +#: erpnext/manufacturing/doctype/work_order/work_order.js:206 +#: erpnext/manufacturing/doctype/work_order/work_order.js:221 +#: erpnext/manufacturing/doctype/work_order/work_order.js:366 +#: erpnext/manufacturing/doctype/work_order/work_order.js:933 #: erpnext/projects/doctype/task/task_tree.js:81 #: erpnext/public/js/communication.js:19 erpnext/public/js/communication.js:31 #: erpnext/public/js/communication.js:41 @@ -13086,32 +13095,32 @@ msgstr "" #: erpnext/stock/doctype/delivery_note/delivery_note.js:96 #: erpnext/stock/doctype/delivery_note/delivery_note.js:98 #: erpnext/stock/doctype/delivery_note/delivery_note.js:121 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:198 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:212 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:222 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:232 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:251 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:256 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:298 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:247 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:261 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:271 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:281 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:300 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:305 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:347 #: erpnext/stock/doctype/item/item.js:167 #: erpnext/stock/doctype/item/item.js:174 #: erpnext/stock/doctype/item/item.js:182 #: erpnext/stock/doctype/item/item.js:549 #: erpnext/stock/doctype/item/item.js:806 -#: erpnext/stock/doctype/material_request/material_request.js:125 -#: erpnext/stock/doctype/material_request/material_request.js:134 +#: erpnext/stock/doctype/material_request/material_request.js:131 #: erpnext/stock/doctype/material_request/material_request.js:140 -#: erpnext/stock/doctype/material_request/material_request.js:148 -#: erpnext/stock/doctype/material_request/material_request.js:156 -#: erpnext/stock/doctype/material_request/material_request.js:164 +#: erpnext/stock/doctype/material_request/material_request.js:146 +#: erpnext/stock/doctype/material_request/material_request.js:154 +#: erpnext/stock/doctype/material_request/material_request.js:162 #: erpnext/stock/doctype/material_request/material_request.js:170 #: erpnext/stock/doctype/material_request/material_request.js:176 -#: erpnext/stock/doctype/material_request/material_request.js:184 -#: erpnext/stock/doctype/material_request/material_request.js:192 -#: erpnext/stock/doctype/material_request/material_request.js:196 -#: erpnext/stock/doctype/material_request/material_request.js:399 +#: erpnext/stock/doctype/material_request/material_request.js:182 +#: erpnext/stock/doctype/material_request/material_request.js:190 +#: erpnext/stock/doctype/material_request/material_request.js:198 +#: erpnext/stock/doctype/material_request/material_request.js:202 +#: erpnext/stock/doctype/material_request/material_request.js:405 +#: erpnext/stock/doctype/pick_list/pick_list.js:113 #: erpnext/stock/doctype/pick_list/pick_list.js:119 -#: erpnext/stock/doctype/pick_list/pick_list.js:125 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:68 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:70 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:82 @@ -13141,6 +13150,10 @@ msgstr "" msgid "Create Chart Of Accounts Based On" msgstr "" +#: erpnext/stock/doctype/pick_list/pick_list.js:111 +msgid "Create Delivery Note" +msgstr "" + #: erpnext/stock/doctype/delivery_note/delivery_note_list.js:61 msgid "Create Delivery Trip" msgstr "" @@ -13166,7 +13179,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:72 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:105 msgid "Create Inter Company Journal Entry" msgstr "" @@ -13174,7 +13187,7 @@ msgstr "" msgid "Create Invoices" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:181 +#: erpnext/manufacturing/doctype/work_order/work_order.js:192 msgid "Create Job Card" msgstr "" @@ -13245,7 +13258,7 @@ msgstr "" msgid "Create Payment Entry" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:725 +#: erpnext/manufacturing/doctype/work_order/work_order.js:718 msgid "Create Pick List" msgstr "" @@ -13303,7 +13316,8 @@ msgid "Create Sample Retention Stock Entry" msgstr "" #: erpnext/stock/dashboard/item_dashboard.js:280 -#: erpnext/stock/doctype/material_request/material_request.js:461 +#: erpnext/stock/doctype/material_request/material_request.js:467 +#: erpnext/stock/doctype/pick_list/pick_list.js:117 msgid "Create Stock Entry" msgstr "" @@ -13347,12 +13361,6 @@ msgstr "" msgid "Create Workstation" msgstr "" -#. Option for the 'Capitalization Method' (Select) field in DocType 'Asset -#. Capitalization' -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json -msgid "Create a new composite asset" -msgstr "" - #: erpnext/stock/doctype/item/item.js:641 #: erpnext/stock/doctype/item/item.js:795 msgid "Create a variant with the template image." @@ -13419,7 +13427,7 @@ msgid "Creating Purchase Order ..." msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:552 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:566 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73 msgid "Creating Purchase Receipt ..." msgstr "" @@ -13428,12 +13436,12 @@ msgstr "" msgid "Creating Sales Invoices ..." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:123 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:137 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:213 msgid "Creating Stock Entry" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:567 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:581 msgid "Creating Subcontracting Order ..." msgstr "" @@ -13494,15 +13502,15 @@ msgstr "" msgid "Credit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:679 +#: erpnext/accounts/report/general_ledger/general_ledger.py:680 msgid "Credit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:654 +#: erpnext/accounts/report/general_ledger/general_ledger.py:655 msgid "Credit ({0})" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:568 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:601 msgid "Credit Account" msgstr "" @@ -13614,7 +13622,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:174 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:147 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1123 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1124 #: erpnext/controllers/sales_and_purchase_return.py:373 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:286 #: erpnext/stock/doctype/delivery_note/delivery_note.js:89 @@ -13641,14 +13649,14 @@ msgstr "" msgid "Credit Note will update it's own outstanding amount, even if 'Return Against' is specified." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:656 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:668 msgid "Credit Note {0} has been created automatically" msgstr "" #. Label of the credit_to (Link) field in DocType 'Purchase Invoice' #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:368 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:376 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:367 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:375 #: erpnext/controllers/accounts_controller.py:2271 msgid "Credit To" msgstr "" @@ -13718,7 +13726,7 @@ msgstr "" msgid "Criteria weights must add up to 100%" msgstr "" -#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:139 +#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:140 msgid "Cron Interval should be between 1 and 59 Min" msgstr "" @@ -13788,6 +13796,8 @@ msgstr "" #. Invoice' #. Label of the currency (Link) field in DocType 'Payment Reconciliation #. Payment' +#. Label of the source_currency (Link) field in DocType 'Pegged Currency +#. Details' #. Label of the currency (Link) field in DocType 'POS Invoice' #. Label of the currency (Link) field in DocType 'POS Profile' #. Label of the currency (Link) field in DocType 'Pricing Rule' @@ -13814,7 +13824,7 @@ msgstr "" #. Label of the currency (Link) field in DocType 'Price List' #. Label of the currency (Link) field in DocType 'Purchase Receipt' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/account_tree.js:167 +#: erpnext/accounts/doctype/account/account_tree.js:172 #: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/dunning/dunning.json @@ -13824,6 +13834,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json +#: erpnext/accounts/doctype/pegged_currency_details/pegged_currency_details.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/pos_profile/pos_profile.json #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json @@ -13834,7 +13845,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/accounts/doctype/subscription_plan/subscription_plan.json #: erpnext/accounts/report/account_balance/account_balance.py:28 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1133 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1134 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:205 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:101 #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:118 @@ -14278,7 +14289,8 @@ msgstr "" #: erpnext/setup/doctype/customer_group/customer_group.json #: erpnext/setup/doctype/territory/territory.json #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/delivery_note/delivery_note.js:433 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:215 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:482 #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json #: erpnext/stock/doctype/item/item.json @@ -14363,7 +14375,7 @@ msgstr "" #. Label of the customer_contact_display (Small Text) field in DocType #. 'Purchase Order' #. Label of the customer_contact (Small Text) field in DocType 'Delivery Stop' -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1094 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1095 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json msgid "Customer Contact" @@ -14459,7 +14471,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/accounts/doctype/tax_rule/tax_rule.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:107 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1151 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1152 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:81 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:185 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:56 @@ -14503,7 +14515,7 @@ msgstr "" msgid "Customer Group Name" msgstr "" -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1243 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1244 msgid "Customer Group: {0} does not exist" msgstr "" @@ -14522,7 +14534,7 @@ msgstr "" msgid "Customer Items" msgstr "" -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1142 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1143 msgid "Customer LPO" msgstr "" @@ -14568,7 +14580,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1084 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1085 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:156 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:92 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:35 @@ -14719,7 +14731,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1085 #: erpnext/selling/doctype/sales_order/sales_order.py:373 -#: erpnext/stock/doctype/delivery_note/delivery_note.py:406 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:416 msgid "Customer {0} does not belong to project {1}" msgstr "" @@ -14951,7 +14963,7 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/dunning/dunning.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:578 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:611 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/pos_invoice_reference/pos_invoice_reference.json #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:36 @@ -15205,15 +15217,15 @@ msgstr "" msgid "Debit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:672 +#: erpnext/accounts/report/general_ledger/general_ledger.py:673 msgid "Debit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:647 +#: erpnext/accounts/report/general_ledger/general_ledger.py:648 msgid "Debit ({0})" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:558 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:591 msgid "Debit Account" msgstr "" @@ -15246,7 +15258,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:176 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:147 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1126 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1127 #: erpnext/controllers/sales_and_purchase_return.py:377 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:287 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:61 @@ -15308,11 +15320,11 @@ msgstr "" msgid "Debit-Credit mismatch" msgstr "" -#: erpnext/accounts/party.py:615 +#: erpnext/accounts/party.py:617 msgid "Debtor/Creditor" msgstr "" -#: erpnext/accounts/party.py:618 +#: erpnext/accounts/party.py:620 msgid "Debtor/Creditor Advance" msgstr "" @@ -16061,7 +16073,7 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'Serial No' #. Option for the 'Tracking Status' (Select) field in DocType 'Shipment' #. Option for the 'Status' (Select) field in DocType 'Stock Reservation Entry' -#: erpnext/buying/doctype/purchase_order/purchase_order.js:383 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:397 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:20 #: erpnext/controllers/website_list_for_contact.py:209 @@ -16124,6 +16136,11 @@ msgstr "" msgid "Delivered Qty" msgstr "" +#. Label of the delivered_qty (Float) field in DocType 'Pick List Item' +#: erpnext/stock/doctype/pick_list_item/pick_list_item.json +msgid "Delivered Qty (in Stock UOM)" +msgstr "" + #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:101 msgid "Delivered Quantity" msgstr "" @@ -16195,7 +16212,6 @@ msgstr "" #: erpnext/stock/doctype/delivery_stop/delivery_stop.json #: erpnext/stock/doctype/delivery_trip/delivery_trip.js:52 #: erpnext/stock/doctype/packing_slip/packing_slip.json -#: erpnext/stock/doctype/pick_list/pick_list.js:117 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:75 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json #: erpnext/stock/doctype/shipment_delivery_note/shipment_delivery_note.json @@ -16242,7 +16258,7 @@ msgstr "" msgid "Delivery Note {0} is not submitted" msgstr "" -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1146 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1147 #: erpnext/stock/doctype/delivery_trip/delivery_trip.js:73 msgid "Delivery Notes" msgstr "" @@ -16261,8 +16277,10 @@ msgid "Delivery Settings" msgstr "" #. Label of the delivery_status (Select) field in DocType 'Sales Order' +#. Label of the delivery_status (Select) field in DocType 'Pick List' #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:25 +#: erpnext/stock/doctype/pick_list/pick_list.json msgid "Delivery Status" msgstr "" @@ -16287,7 +16305,7 @@ msgstr "" #. Label of the delivery_trip (Link) field in DocType 'Delivery Note' #. Name of a DocType #. Label of a Link in the Stock Workspace -#: erpnext/stock/doctype/delivery_note/delivery_note.js:228 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:277 #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_trip/delivery_trip.json #: erpnext/stock/workspace/stock/stock.json @@ -16516,11 +16534,11 @@ msgstr "" msgid "Depreciation Posting Date cannot be before Available-for-use Date" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:321 +#: erpnext/assets/doctype/asset/asset.py:318 msgid "Depreciation Row {0}: Depreciation Posting Date cannot be before Available-for-use Date" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:572 +#: erpnext/assets/doctype/asset/asset.py:569 msgid "Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1}" msgstr "" @@ -16547,7 +16565,7 @@ msgstr "" msgid "Depreciation Schedule View" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:415 +#: erpnext/assets/doctype/asset/asset.py:412 msgid "Depreciation cannot be calculated for fully depreciated assets" msgstr "" @@ -16953,11 +16971,11 @@ msgstr "" msgid "Difference Account" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:545 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:546 msgid "Difference Account in Items Table" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:534 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:535 msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" @@ -17021,7 +17039,7 @@ msgstr "" msgid "Difference Value" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.js:442 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:491 msgid "Different 'Source Warehouse' and 'Target Warehouse' can be set for each row." msgstr "" @@ -17252,7 +17270,7 @@ msgstr "" msgid "Disassemble" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:206 +#: erpnext/manufacturing/doctype/work_order/work_order.js:217 msgid "Disassemble Order" msgstr "" @@ -17419,6 +17437,8 @@ msgstr "" #. Invoice Item' #. Label of the discount_and_margin_section (Section Break) field in DocType #. 'Purchase Order Item' +#. Label of the discount_and_margin_section (Section Break) field in DocType +#. 'Supplier Quotation Item' #. Label of the discount_and_margin (Section Break) field in DocType 'Quotation #. Item' #. Label of the discount_and_margin (Section Break) field in DocType 'Sales @@ -17431,6 +17451,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json +#: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -17865,7 +17886,7 @@ msgstr "" msgid "Document Type already used as a dimension" msgstr "" -#: erpnext/setup/install.py:151 +#: erpnext/setup/install.py:152 msgid "Documentation" msgstr "" @@ -18185,7 +18206,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:72 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1110 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1111 #: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:40 msgid "Due Date" @@ -18199,11 +18220,11 @@ msgstr "" msgid "Due Date Based On" msgstr "" -#: erpnext/accounts/party.py:701 +#: erpnext/accounts/party.py:703 msgid "Due Date cannot be after {0}" msgstr "" -#: erpnext/accounts/party.py:677 +#: erpnext/accounts/party.py:679 msgid "Due Date cannot be before {0}" msgstr "" @@ -18276,7 +18297,7 @@ msgstr "" msgid "Duplicate Entry. Please check Authorization Rule {0}" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:345 +#: erpnext/assets/doctype/asset/asset.py:342 msgid "Duplicate Finance Book" msgstr "" @@ -18469,7 +18490,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json -#: erpnext/stock/doctype/delivery_note/delivery_note.js:446 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:495 #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -18885,7 +18906,7 @@ msgstr "" msgid "Employee {0} does not belongs to the company {1}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:298 +#: erpnext/manufacturing/doctype/job_card/job_card.py:306 msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "" @@ -18902,7 +18923,7 @@ msgstr "" msgid "Ems(Pica)" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1473 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1545 msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock." msgstr "" @@ -19029,6 +19050,14 @@ msgstr "" msgid "Enable this checkbox even if you want to set the zero priority" msgstr "" +#. Description of the 'Allow Pegged Currencies Exchange Rates' (Check) field in +#. DocType 'Accounts Settings' +#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json +msgid "" +"Enable this field to fetch the exchange rates for Pegged Currencies.\n" +"\n" +msgstr "" + #. Description of the 'Calculate daily depreciation using total days in #. depreciation period' (Check) field in DocType 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -19131,7 +19160,7 @@ msgstr "" msgid "End Date" msgstr "" -#: erpnext/crm/doctype/contract/contract.py:83 +#: erpnext/crm/doctype/contract/contract.py:70 msgid "End Date cannot be before Start Date." msgstr "" @@ -19139,8 +19168,8 @@ msgstr "" #. Label of the end_time (Time) field in DocType 'Stock Reposting Settings' #. Label of the end_time (Time) field in DocType 'Service Day' #. Label of the end_time (Datetime) field in DocType 'Call Log' -#: erpnext/manufacturing/doctype/job_card/job_card.js:272 -#: erpnext/manufacturing/doctype/job_card/job_card.js:341 +#: erpnext/manufacturing/doctype/job_card/job_card.js:270 +#: erpnext/manufacturing/doctype/job_card/job_card.js:339 #: erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json #: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json #: erpnext/support/doctype/service_day/service_day.json @@ -19227,12 +19256,12 @@ msgstr "" msgid "Enter Serial Nos" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:398 +#: erpnext/stock/doctype/material_request/material_request.js:404 msgid "Enter Supplier" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:298 -#: erpnext/manufacturing/doctype/job_card/job_card.js:367 +#: erpnext/manufacturing/doctype/job_card/job_card.js:296 +#: erpnext/manufacturing/doctype/job_card/job_card.js:365 #: erpnext/manufacturing/doctype/workstation/workstation.js:312 msgid "Enter Value" msgstr "" @@ -19273,7 +19302,7 @@ msgstr "" msgid "Enter date to scrap asset" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:413 +#: erpnext/assets/doctype/asset/asset.py:410 msgid "Enter depreciation details" msgstr "" @@ -19312,7 +19341,7 @@ msgstr "" msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1036 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1029 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set." msgstr "" @@ -19381,9 +19410,9 @@ msgstr "" #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json #: erpnext/accounts/doctype/payment_request/payment_request.py:443 #: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.json -#: erpnext/manufacturing/doctype/job_card/job_card.py:875 +#: erpnext/manufacturing/doctype/job_card/job_card.py:883 #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:298 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:314 msgid "Error" msgstr "" @@ -19523,7 +19552,7 @@ msgstr "" msgid "Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings." msgstr "" -#: erpnext/stock/stock_ledger.py:2155 +#: erpnext/stock/stock_ledger.py:2158 msgid "Example: Serial No {0} reserved in {1}." msgstr "" @@ -19537,7 +19566,7 @@ msgstr "" msgid "Excess Materials Consumed" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:969 +#: erpnext/manufacturing/doctype/job_card/job_card.py:977 msgid "Excess Transfer" msgstr "" @@ -19591,6 +19620,8 @@ msgstr "" #. Invoice' #. Label of the exchange_rate (Float) field in DocType 'Payment Reconciliation #. Payment' +#. Label of the pegged_exchange_rate (Data) field in DocType 'Pegged Currency +#. Details' #. Label of the conversion_rate (Float) field in DocType 'POS Invoice' #. Label of the exchange_rate (Float) field in DocType 'Process Payment #. Reconciliation Log Allocations' @@ -19612,6 +19643,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json +#: erpnext/accounts/doctype/pegged_currency_details/pegged_currency_details.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -19732,7 +19764,7 @@ msgstr "" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:154 #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:187 #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:197 -#: erpnext/public/js/setup_wizard.js:187 +#: erpnext/public/js/setup_wizard.js:191 msgid "Expand All" msgstr "" @@ -19846,7 +19878,7 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json #: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:595 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:594 #: erpnext/accounts/report/account_balance/account_balance.js:28 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:89 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:178 @@ -19854,7 +19886,7 @@ msgstr "" msgid "Expense" msgstr "" -#: erpnext/controllers/stock_controller.py:778 +#: erpnext/controllers/stock_controller.py:783 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "" @@ -19899,7 +19931,7 @@ msgstr "" msgid "Expense Account" msgstr "" -#: erpnext/controllers/stock_controller.py:758 +#: erpnext/controllers/stock_controller.py:763 msgid "Expense Account Missing" msgstr "" @@ -19914,13 +19946,13 @@ msgstr "" msgid "Expense Head" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:489 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:513 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:533 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:488 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:512 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:532 msgid "Expense Head Changed" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:591 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:590 msgid "Expense account is mandatory for item {0}" msgstr "" @@ -19968,7 +20000,7 @@ msgstr "" msgid "Expired" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:235 +#: erpnext/stock/doctype/pick_list/pick_list.py:251 #: erpnext/stock/doctype/stock_entry/stock_entry.js:370 msgid "Expired Batches" msgstr "" @@ -20297,7 +20329,7 @@ msgstr "" msgid "Fetch Value From" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:333 +#: erpnext/stock/doctype/material_request/material_request.js:339 #: erpnext/stock/doctype/stock_entry/stock_entry.js:654 msgid "Fetch exploded BOM (including sub-assemblies)" msgstr "" @@ -20308,7 +20340,7 @@ msgstr "" msgid "Fetch items based on Default Supplier." msgstr "" -#: erpnext/selling/page/point_of_sale/pos_item_details.js:446 +#: erpnext/selling/page/point_of_sale/pos_item_details.js:455 msgid "Fetched only {0} available serial numbers." msgstr "" @@ -20561,9 +20593,9 @@ msgstr "" msgid "Financial reports will be generated using GL Entry doctypes (should be enabled if Period Closing Voucher is not posted for all years sequentially or missing) " msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:774 -#: erpnext/manufacturing/doctype/work_order/work_order.js:789 -#: erpnext/manufacturing/doctype/work_order/work_order.js:798 +#: erpnext/manufacturing/doctype/work_order/work_order.js:767 +#: erpnext/manufacturing/doctype/work_order/work_order.js:782 +#: erpnext/manufacturing/doctype/work_order/work_order.js:791 msgid "Finish" msgstr "" @@ -20576,7 +20608,7 @@ msgstr "" #. Label of the parent_item_code (Link) field in DocType 'Production Plan Sub #. Assembly Item' #. Label of the finished_good (Link) field in DocType 'Subcontracting BOM' -#: erpnext/buying/doctype/purchase_order/purchase_order.js:229 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:243 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/manufacturing/doctype/bom_creator/bom_creator.json #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json @@ -20711,7 +20743,7 @@ msgstr "" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1350 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1359 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -20850,7 +20882,7 @@ msgstr "" #. Capitalization Asset Item' #. Label of the fixed_asset_account (Link) field in DocType 'Asset Category #. Account' -#: erpnext/assets/doctype/asset/asset.py:754 +#: erpnext/assets/doctype/asset/asset.py:751 #: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json #: erpnext/assets/doctype/asset_category_account/asset_category_account.json msgid "Fixed Asset Account" @@ -20977,6 +21009,12 @@ msgstr "" msgid "For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table." msgstr "" +#. Label of the for_all_stock_asset_accounts (Check) field in DocType 'Journal +#. Entry' +#: erpnext/accounts/doctype/journal_entry/journal_entry.json +msgid "For All Stock Asset Accounts" +msgstr "" + #. Label of the for_buying (Check) field in DocType 'Currency Exchange' #: erpnext/setup/doctype/currency_exchange/currency_exchange.json msgid "For Buying" @@ -20987,7 +21025,7 @@ msgstr "" msgid "For Company" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:376 +#: erpnext/stock/doctype/material_request/material_request.js:382 msgid "For Default Supplier (Optional)" msgstr "" @@ -20996,7 +21034,7 @@ msgstr "" msgid "For Item" msgstr "" -#: erpnext/controllers/stock_controller.py:1236 +#: erpnext/controllers/stock_controller.py:1326 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -21006,7 +21044,7 @@ msgid "For Job Card" msgstr "" #. Label of the for_operation (Link) field in DocType 'Job Card' -#: erpnext/manufacturing/doctype/job_card/job_card.js:411 +#: erpnext/manufacturing/doctype/job_card/job_card.js:409 #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "For Operation" msgstr "" @@ -21027,7 +21065,7 @@ msgstr "" msgid "For Production" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:639 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:640 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "" @@ -21056,7 +21094,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan/production_plan.js:458 #: erpnext/manufacturing/doctype/production_plan/production_plan.json #: erpnext/selling/doctype/sales_order/sales_order.js:985 -#: erpnext/stock/doctype/material_request/material_request.js:325 +#: erpnext/stock/doctype/material_request/material_request.js:331 #: erpnext/templates/form_grid/material_request_grid.html:36 msgid "For Warehouse" msgstr "" @@ -21065,11 +21103,11 @@ msgstr "" msgid "For Work Order" msgstr "" -#: erpnext/controllers/status_updater.py:267 +#: erpnext/controllers/status_updater.py:278 msgid "For an item {0}, quantity must be negative number" msgstr "" -#: erpnext/controllers/status_updater.py:264 +#: erpnext/controllers/status_updater.py:275 msgid "For an item {0}, quantity must be positive number" msgstr "" @@ -21095,19 +21133,19 @@ msgstr "" msgid "For individual supplier" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:283 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:308 msgid "For item {0}, only {1} asset have been created or linked to {2}. Please create or link {3} more asset with the respective document." msgstr "" -#: erpnext/controllers/status_updater.py:272 +#: erpnext/controllers/status_updater.py:283 msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2141 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2143 msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1388 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1397 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -21121,7 +21159,7 @@ msgstr "" msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1630 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1631 msgid "For row {0}: Enter Planned Qty" msgstr "" @@ -21134,7 +21172,7 @@ msgstr "" msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:779 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:780 msgid "For the item {0}, the quantity should be {1} according to the BOM {2}." msgstr "" @@ -21143,7 +21181,7 @@ msgctxt "Clear payment terms template and/or payment schedule when due date is c msgid "For the new {0} to take effect, would you like to clear the current {1}?" msgstr "" -#: erpnext/controllers/stock_controller.py:324 +#: erpnext/controllers/stock_controller.py:329 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "" @@ -21822,7 +21860,9 @@ msgid "Fully Completed" msgstr "" #. Option for the 'Delivery Status' (Select) field in DocType 'Sales Order' +#. Option for the 'Delivery Status' (Select) field in DocType 'Pick List' #: erpnext/selling/doctype/sales_order/sales_order.json +#: erpnext/stock/doctype/pick_list/pick_list.json msgid "Fully Delivered" msgstr "" @@ -21865,14 +21905,14 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:186 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:155 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1138 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1139 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:177 msgid "Future Payment Amount" msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:185 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:154 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1137 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1138 msgid "Future Payment Ref" msgstr "" @@ -21897,7 +21937,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:633 msgid "GL Entry" msgstr "" @@ -22102,6 +22142,12 @@ msgstr "" msgid "Get Allocations" msgstr "" +#. Label of the get_balance_for_periodic_accounting (Button) field in DocType +#. 'Journal Entry' +#: erpnext/accounts/doctype/journal_entry/journal_entry.json +msgid "Get Balance" +msgstr "" + #. Label of the get_current_stock (Button) field in DocType 'Purchase Receipt' #. Label of the get_current_stock (Button) field in DocType 'Subcontracting #. Receipt' @@ -22148,9 +22194,9 @@ msgstr "" #. Label of the get_items (Button) field in DocType 'Stock Entry' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:408 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:469 -#: erpnext/stock/doctype/material_request/material_request.js:337 -#: erpnext/stock/doctype/pick_list/pick_list.js:200 -#: erpnext/stock/doctype/pick_list/pick_list.js:243 +#: erpnext/stock/doctype/material_request/material_request.js:343 +#: erpnext/stock/doctype/pick_list/pick_list.js:194 +#: erpnext/stock/doctype/pick_list/pick_list.js:237 #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:178 msgid "Get Items" @@ -22163,8 +22209,8 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:299 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:330 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1073 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:595 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:615 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:609 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:629 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:366 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:388 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:433 @@ -22180,8 +22226,9 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:174 #: erpnext/selling/doctype/sales_order/sales_order.js:792 #: erpnext/stock/doctype/delivery_note/delivery_note.js:187 -#: erpnext/stock/doctype/material_request/material_request.js:109 -#: erpnext/stock/doctype/material_request/material_request.js:204 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:236 +#: erpnext/stock/doctype/material_request/material_request.js:115 +#: erpnext/stock/doctype/material_request/material_request.js:210 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:156 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:270 #: erpnext/stock/doctype/stock_entry/stock_entry.js:317 @@ -22196,7 +22243,7 @@ msgstr "" #. Label of the get_items_from_purchase_receipts (Button) field in DocType #. 'Landed Cost Voucher' #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json -msgid "Get Items From Purchase Receipts" +msgid "Get Items From Receipts" msgstr "" #. Label of the transfer_materials (Button) field in DocType 'Production Plan' @@ -22209,7 +22256,7 @@ msgstr "" msgid "Get Items for Purchase Only" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:310 +#: erpnext/stock/doctype/material_request/material_request.js:316 #: erpnext/stock/doctype/stock_entry/stock_entry.js:657 #: erpnext/stock/doctype/stock_entry/stock_entry.js:670 msgid "Get Items from BOM" @@ -22399,7 +22446,7 @@ msgstr "" msgid "Goods Transferred" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1812 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1882 msgid "Goods are already received against the outward entry {0}" msgstr "" @@ -22656,11 +22703,11 @@ msgstr "" msgid "Gross Purchase Amount" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:383 +#: erpnext/assets/doctype/asset/asset.py:380 msgid "Gross Purchase Amount is mandatory" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:428 +#: erpnext/assets/doctype/asset/asset.py:425 msgid "Gross Purchase Amount should be equal to purchase amount of one single Asset." msgstr "" @@ -23131,7 +23178,7 @@ msgstr "" msgid "History In Company" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:362 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:376 #: erpnext/selling/doctype/sales_order/sales_order.js:611 msgid "Hold" msgstr "" @@ -23588,7 +23635,7 @@ msgstr "" msgid "If subcontracted to a vendor" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1069 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1062 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected." msgstr "" @@ -23601,7 +23648,7 @@ msgstr "" msgid "If the item is transacting as a Zero Valuation Rate item in this entry, please enable 'Allow Zero Valuation Rate' in the {0} Item table." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1088 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1081 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed." msgstr "" @@ -23688,7 +23735,7 @@ msgstr "" msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox." msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1743 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1744 msgid "If you still want to proceed, please enable {0}." msgstr "" @@ -23766,7 +23813,7 @@ msgstr "" msgid "Ignore Existing Ordered Qty" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1735 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1736 msgid "Ignore Existing Projected Quantity" msgstr "" @@ -24174,11 +24221,11 @@ msgstr "" msgid "In Transit" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:460 +#: erpnext/stock/doctype/material_request/material_request.js:466 msgid "In Transit Transfer" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:429 +#: erpnext/stock/doctype/material_request/material_request.js:435 msgid "In Transit Warehouse" msgstr "" @@ -24600,16 +24647,16 @@ msgstr "" msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:784 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:785 msgid "Incorrect Component Quantity" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:324 +#: erpnext/assets/doctype/asset/asset.py:321 #: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py:56 msgid "Incorrect Date" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:120 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:124 msgid "Incorrect Invoice" msgstr "" @@ -24617,7 +24664,7 @@ msgstr "" msgid "Incorrect Payment Type" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:93 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:97 msgid "Incorrect Reference Document (Purchase Receipt Item)" msgstr "" @@ -24644,7 +24691,7 @@ msgstr "" msgid "Incorrect Type of Transaction" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:152 +#: erpnext/stock/doctype/pick_list/pick_list.py:155 #: erpnext/stock/doctype/stock_settings/stock_settings.py:120 msgid "Incorrect Warehouse" msgstr "" @@ -24807,13 +24854,13 @@ msgstr "" msgid "Inspected By" msgstr "" -#: erpnext/controllers/stock_controller.py:1130 +#: erpnext/controllers/stock_controller.py:1220 msgid "Inspection Rejected" msgstr "" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1100 -#: erpnext/controllers/stock_controller.py:1102 +#: erpnext/controllers/stock_controller.py:1190 +#: erpnext/controllers/stock_controller.py:1192 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "" @@ -24830,7 +24877,7 @@ msgstr "" msgid "Inspection Required before Purchase" msgstr "" -#: erpnext/controllers/stock_controller.py:1115 +#: erpnext/controllers/stock_controller.py:1205 msgid "Inspection Submission" msgstr "" @@ -24850,7 +24897,7 @@ msgstr "" #. 'Installation Note' #. Label of a Link in the Stock Workspace #: erpnext/selling/doctype/installation_note/installation_note.json -#: erpnext/stock/doctype/delivery_note/delivery_note.js:208 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:257 #: erpnext/stock/workspace/stock/stock.json msgid "Installation Note" msgstr "" @@ -24860,7 +24907,7 @@ msgstr "" msgid "Installation Note Item" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:610 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:622 msgid "Installation Note {0} has already been submitted" msgstr "" @@ -24914,16 +24961,16 @@ msgstr "" msgid "Insufficient Permissions" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:111 -#: erpnext/stock/doctype/pick_list/pick_list.py:129 -#: erpnext/stock/doctype/pick_list/pick_list.py:977 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:759 -#: erpnext/stock/serial_batch_bundle.py:1021 erpnext/stock/stock_ledger.py:1574 -#: erpnext/stock/stock_ledger.py:2046 +#: erpnext/stock/doctype/pick_list/pick_list.py:114 +#: erpnext/stock/doctype/pick_list/pick_list.py:132 +#: erpnext/stock/doctype/pick_list/pick_list.py:1004 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:760 +#: erpnext/stock/serial_batch_bundle.py:1064 erpnext/stock/stock_ledger.py:1574 +#: erpnext/stock/stock_ledger.py:2049 msgid "Insufficient Stock" msgstr "" -#: erpnext/stock/stock_ledger.py:2061 +#: erpnext/stock/stock_ledger.py:2064 msgid "Insufficient Stock for Batch" msgstr "" @@ -25109,7 +25156,7 @@ msgstr "" msgid "Internal Work History" msgstr "" -#: erpnext/controllers/stock_controller.py:1197 +#: erpnext/controllers/stock_controller.py:1287 msgid "Internal transfers can only be done in company's default currency" msgstr "" @@ -25133,8 +25180,8 @@ msgstr "" msgid "Invalid" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:369 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:377 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:368 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:376 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:959 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:969 #: erpnext/assets/doctype/asset_category/asset_category.py:69 @@ -25177,8 +25224,8 @@ msgstr "" msgid "Invalid Company for Inter Company Transaction." msgstr "" -#: erpnext/assets/doctype/asset/asset.py:295 -#: erpnext/assets/doctype/asset/asset.py:302 +#: erpnext/assets/doctype/asset/asset.py:292 +#: erpnext/assets/doctype/asset/asset.py:299 #: erpnext/controllers/accounts_controller.py:3083 msgid "Invalid Cost Center" msgstr "" @@ -25195,7 +25242,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:107 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:111 msgid "Invalid Document" msgstr "" @@ -25208,7 +25255,7 @@ msgstr "" msgid "Invalid Formula" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:433 +#: erpnext/assets/doctype/asset/asset.py:430 msgid "Invalid Gross Purchase Amount" msgstr "" @@ -25283,8 +25330,8 @@ msgstr "" msgid "Invalid Sales Invoices" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:518 -#: erpnext/assets/doctype/asset/asset.py:537 +#: erpnext/assets/doctype/asset/asset.py:515 +#: erpnext/assets/doctype/asset/asset.py:534 msgid "Invalid Schedule" msgstr "" @@ -25292,7 +25339,7 @@ msgstr "" msgid "Invalid Selling Price" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1427 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1440 msgid "Invalid Serial and Batch Bundle" msgstr "" @@ -25305,7 +25352,7 @@ msgid "Invalid Value" msgstr "" #: erpnext/stock/doctype/putaway_rule/putaway_rule.py:69 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:128 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:192 msgid "Invalid Warehouse" msgstr "" @@ -25431,7 +25478,7 @@ msgstr "" msgid "Invoice Document Type Selection Error" msgstr "" -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1118 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1119 msgid "Invoice Grand Total" msgstr "" @@ -25530,7 +25577,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:169 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:144 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1120 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1121 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:164 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:165 msgid "Invoiced Amount" @@ -26149,7 +26196,7 @@ msgstr "" msgid "Issue Date" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:146 +#: erpnext/stock/doctype/material_request/material_request.js:152 msgid "Issue Material" msgstr "" @@ -26227,7 +26274,7 @@ msgstr "" msgid "It is needed to fetch Item Details." msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:156 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:160 msgid "It's not possible to distribute charges equally when total amount is zero, please set 'Distribute Charges Based On' as 'Quantity'" msgstr "" @@ -26626,7 +26673,7 @@ msgstr "" msgid "Item Code cannot be changed for Serial No." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:444 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:443 msgid "Item Code required at Row No {0}" msgstr "" @@ -27073,7 +27120,7 @@ msgstr "" msgid "Item Price Stock" msgstr "" -#: erpnext/stock/get_item_details.py:1057 +#: erpnext/stock/get_item_details.py:1060 msgid "Item Price added for {0} in Price List {1}" msgstr "" @@ -27081,7 +27128,7 @@ msgstr "" msgid "Item Price appears multiple times based on Price List, Supplier/Customer, Currency, Item, Batch, UOM, Qty, and Dates." msgstr "" -#: erpnext/stock/get_item_details.py:1036 +#: erpnext/stock/get_item_details.py:1039 msgid "Item Price updated for {0} in Price List {1}" msgstr "" @@ -27116,7 +27163,7 @@ msgstr "" msgid "Item Reorder" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:130 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:134 msgid "Item Row {0}: {1} {2} does not exist in above '{1}' table" msgstr "" @@ -27325,7 +27372,7 @@ msgstr "" msgid "Item and Warranty Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2696 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2766 msgid "Item for row {0} does not match Material Request" msgstr "" @@ -27341,7 +27388,7 @@ msgstr "" msgid "Item is removed since no serial / batch no selected." msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:126 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:130 msgid "Item must be added using 'Get Items from Purchase Receipts' button" msgstr "" @@ -27359,7 +27406,7 @@ msgstr "" msgid "Item qty can not be updated as raw materials are already processed." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:875 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -27373,7 +27420,7 @@ msgstr "" msgid "Item to be manufactured or repacked" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js:34 msgid "Item valuation rate is recalculated considering landed cost voucher amount" msgstr "" @@ -27393,7 +27440,7 @@ msgstr "" msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "" -#: erpnext/assets/doctype/asset/asset.py:277 +#: erpnext/assets/doctype/asset/asset.py:274 #: erpnext/stock/doctype/item/item.py:634 msgid "Item {0} does not exist" msgstr "" @@ -27402,7 +27449,7 @@ msgstr "" msgid "Item {0} does not exist in the system or has expired" msgstr "" -#: erpnext/controllers/stock_controller.py:414 +#: erpnext/controllers/stock_controller.py:419 msgid "Item {0} does not exist." msgstr "" @@ -27414,7 +27461,7 @@ msgstr "" msgid "Item {0} has already been returned" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:279 +#: erpnext/assets/doctype/asset/asset.py:276 msgid "Item {0} has been disabled" msgstr "" @@ -27430,7 +27477,7 @@ msgstr "" msgid "Item {0} ignored since it is not a stock item" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:472 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:536 msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "" @@ -27454,27 +27501,27 @@ msgstr "" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1724 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1794 msgid "Item {0} is not active or end of life has been reached" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:281 +#: erpnext/assets/doctype/asset/asset.py:278 msgid "Item {0} must be a Fixed Asset Item" msgstr "" -#: erpnext/stock/get_item_details.py:328 +#: erpnext/stock/get_item_details.py:331 msgid "Item {0} must be a Non-Stock Item" msgstr "" -#: erpnext/stock/get_item_details.py:325 +#: erpnext/stock/get_item_details.py:328 msgid "Item {0} must be a Sub-contracted Item" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:283 +#: erpnext/assets/doctype/asset/asset.py:280 msgid "Item {0} must be a non-stock item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1167 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1176 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -27490,7 +27537,7 @@ msgstr "" msgid "Item {0}: {1} qty produced. " msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1428 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1429 msgid "Item {} does not exist." msgstr "" @@ -27527,7 +27574,7 @@ msgstr "" msgid "Item-wise Sales Register" msgstr "" -#: erpnext/stock/get_item_details.py:697 +#: erpnext/stock/get_item_details.py:700 msgid "Item/Item Code required to get Item Tax Template." msgstr "" @@ -27589,7 +27636,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:19 #: erpnext/setup/doctype/item_group/item_group.js:87 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:438 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:487 #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/material_request/material_request.json #: erpnext/stock/doctype/packing_slip/packing_slip.json @@ -27617,7 +27664,7 @@ msgstr "" msgid "Items Filter" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1596 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1597 #: erpnext/selling/doctype/sales_order/sales_order.js:1234 msgid "Items Required" msgstr "" @@ -27642,7 +27689,7 @@ msgstr "" msgid "Items for Raw Material Request" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:871 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:872 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -27652,7 +27699,7 @@ msgstr "" msgid "Items to Be Repost" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1595 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1596 msgid "Items to Manufacture are required to pull the Raw Materials associated with it." msgstr "" @@ -27671,7 +27718,7 @@ msgstr "" msgid "Items under this warehouse will be suggested" msgstr "" -#: erpnext/controllers/stock_controller.py:114 +#: erpnext/controllers/stock_controller.py:115 msgid "Items {0} do not exist in the Item master." msgstr "" @@ -27714,9 +27761,9 @@ msgstr "" #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/manufacturing/doctype/bom/bom.json #: erpnext/manufacturing/doctype/job_card/job_card.json -#: erpnext/manufacturing/doctype/job_card/job_card.py:868 +#: erpnext/manufacturing/doctype/job_card/job_card.py:876 #: erpnext/manufacturing/doctype/operation/operation.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:354 +#: erpnext/manufacturing/doctype/work_order/work_order.js:365 #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:29 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:86 @@ -27775,7 +27822,7 @@ msgstr "" msgid "Job Card and Capacity Planning" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1281 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1291 msgid "Job Card {0} has been completed" msgstr "" @@ -27844,7 +27891,7 @@ msgstr "" msgid "Job Worker Warehouse" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2192 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2194 msgid "Job card {0} created" msgstr "" @@ -27930,7 +27977,7 @@ msgstr "" msgid "Journal Entry Type" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:565 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:643 msgid "Journal Entry for Asset scrapping cannot be cancelled. Please restore the Asset." msgstr "" @@ -27939,11 +27986,11 @@ msgstr "" msgid "Journal Entry for Scrap" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:276 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:350 msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:715 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:793 msgid "Journal Entry {0} does not have account {1} or already matched against other voucher" msgstr "" @@ -28073,7 +28120,7 @@ msgstr "" msgid "Kilowatt-Hour" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:870 +#: erpnext/manufacturing/doctype/job_card/job_card.py:878 msgid "Kindly cancel the Manufacturing Entries first against the work order {0}." msgstr "" @@ -28141,8 +28188,14 @@ msgstr "" #. 'Purchase Invoice Item' #. Label of the landed_cost_voucher_amount (Currency) field in DocType #. 'Purchase Receipt Item' +#. Label of the landed_cost_voucher_amount (Currency) field in DocType 'Stock +#. Entry Detail' +#. Label of the landed_cost_voucher_amount (Currency) field in DocType +#. 'Subcontracting Receipt Item' #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json +#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json msgid "Landed Cost Voucher Amount" msgstr "" @@ -28452,7 +28505,7 @@ msgstr "" msgid "Leave blank to use the standard Delivery Note format" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:30 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:63 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:406 #: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js:43 msgid "Ledger" @@ -28661,7 +28714,7 @@ msgstr "" msgid "Likes" msgstr "" -#: erpnext/controllers/status_updater.py:396 +#: erpnext/controllers/status_updater.py:407 msgid "Limit Crossed" msgstr "" @@ -28712,7 +28765,7 @@ msgstr "" msgid "Link existing Quality Procedure." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:634 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:648 msgid "Link to Material Request" msgstr "" @@ -29362,8 +29415,8 @@ msgid "Major/Optional Subjects" msgstr "" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:76 -#: erpnext/manufacturing/doctype/job_card/job_card.js:432 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:109 +#: erpnext/manufacturing/doctype/job_card/job_card.js:430 #: erpnext/setup/doctype/vehicle/vehicle.json msgid "Make" msgstr "" @@ -29416,12 +29469,12 @@ msgstr "" msgid "Make Serial No / Batch from Work Order" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:54 +#: erpnext/manufacturing/doctype/job_card/job_card.js:53 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:282 msgid "Make Stock Entry" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:306 +#: erpnext/manufacturing/doctype/job_card/job_card.js:304 msgid "Make Subcontracting PO" msgstr "" @@ -29441,7 +29494,7 @@ msgstr "" msgid "Make {0} Variants" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:163 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:167 msgid "Making Journal Entries against advance accounts: {0} is not recommended. These Journals won't be available for Reconciliation." msgstr "" @@ -29494,6 +29547,7 @@ msgstr "" #: erpnext/public/js/controllers/transaction.js:2805 #: erpnext/public/js/utils/party.js:321 #: erpnext/stock/doctype/delivery_note/delivery_note.js:164 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:203 #: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:138 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:250 @@ -29531,11 +29585,11 @@ msgstr "" msgid "Mandatory Missing" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:627 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:626 msgid "Mandatory Purchase Order" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:648 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:647 msgid "Mandatory Purchase Receipt" msgstr "" @@ -29609,8 +29663,8 @@ msgstr "" #: erpnext/stock/doctype/material_request_item/material_request_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:952 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:968 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:953 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:969 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json @@ -29746,7 +29800,7 @@ msgstr "" msgid "Manufacturing Manager" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1939 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2009 msgid "Manufacturing Quantity is mandatory" msgstr "" @@ -29832,6 +29886,8 @@ msgstr "" #. Item' #. Label of the margin_rate_or_amount (Float) field in DocType 'Purchase Order #. Item' +#. Label of the margin_rate_or_amount (Float) field in DocType 'Supplier +#. Quotation Item' #. Label of the margin_rate_or_amount (Float) field in DocType 'Quotation Item' #. Label of the margin_rate_or_amount (Float) field in DocType 'Sales Order #. Item' @@ -29844,6 +29900,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json +#: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -29857,6 +29914,7 @@ msgstr "" #. Label of the margin_type (Select) field in DocType 'Purchase Invoice Item' #. Label of the margin_type (Select) field in DocType 'Sales Invoice Item' #. Label of the margin_type (Select) field in DocType 'Purchase Order Item' +#. Label of the margin_type (Select) field in DocType 'Supplier Quotation Item' #. Label of the margin_type (Select) field in DocType 'Quotation Item' #. Label of the margin_type (Select) field in DocType 'Sales Order Item' #. Label of the margin_type (Select) field in DocType 'Delivery Note Item' @@ -29867,6 +29925,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json +#: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -29946,7 +30005,7 @@ msgstr "" msgid "Material" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:755 +#: erpnext/manufacturing/doctype/work_order/work_order.js:748 msgid "Material Consumption" msgstr "" @@ -29954,7 +30013,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:121 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:953 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:954 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "" @@ -29984,7 +30043,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:84 -#: erpnext/stock/doctype/material_request/material_request.js:154 +#: erpnext/stock/doctype/material_request/material_request.js:160 #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Receipt" @@ -30021,7 +30080,7 @@ msgstr "" #. Label of the material_request (Link) field in DocType 'Subcontracting Order #. Service Item' #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json -#: erpnext/buying/doctype/purchase_order/purchase_order.js:574 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:588 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:347 #: erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json @@ -30030,7 +30089,7 @@ msgstr "" #: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:33 #: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:184 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/manufacturing/doctype/job_card/job_card.js:100 +#: erpnext/manufacturing/doctype/job_card/job_card.js:99 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:147 #: erpnext/manufacturing/doctype/production_plan/production_plan.json #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json @@ -30126,7 +30185,7 @@ msgstr "" msgid "Material Request Type" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1673 +#: erpnext/selling/doctype/sales_order/sales_order.py:1679 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "" @@ -30180,11 +30239,11 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Pick List' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' -#: erpnext/manufacturing/doctype/job_card/job_card.js:110 +#: erpnext/manufacturing/doctype/job_card/job_card.js:109 #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json #: erpnext/setup/setup_wizard/operations/install_fixtures.py:90 #: erpnext/stock/doctype/item/item.json -#: erpnext/stock/doctype/material_request/material_request.js:132 +#: erpnext/stock/doctype/material_request/material_request.js:138 #: erpnext/stock/doctype/material_request/material_request.json #: erpnext/stock/doctype/pick_list/pick_list.json #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -30192,7 +30251,7 @@ msgstr "" msgid "Material Transfer" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:138 +#: erpnext/stock/doctype/material_request/material_request.js:144 msgid "Material Transfer (In Transit)" msgstr "" @@ -30231,7 +30290,7 @@ msgstr "" msgid "Material Transferred for Subcontract" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:413 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:427 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:264 msgid "Material to Supplier" msgstr "" @@ -30240,7 +30299,7 @@ msgstr "" msgid "Materials are already received against the {0} {1}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:721 +#: erpnext/manufacturing/doctype/job_card/job_card.py:729 msgid "Materials needs to be transferred to the work in progress warehouse for the job card {0}" msgstr "" @@ -30304,8 +30363,8 @@ msgstr "" msgid "Max discount allowed for item: {0} is {1}%" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:903 -#: erpnext/stock/doctype/pick_list/pick_list.js:183 +#: erpnext/manufacturing/doctype/work_order/work_order.js:896 +#: erpnext/stock/doctype/pick_list/pick_list.js:177 msgid "Max: {0}" msgstr "" @@ -30326,11 +30385,11 @@ msgstr "" msgid "Maximum Payment Amount" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3234 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3304 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3225 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3295 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "" @@ -30535,7 +30594,7 @@ msgstr "" msgid "Messages greater than 160 characters will be split into multiple messages" msgstr "" -#: erpnext/setup/install.py:123 +#: erpnext/setup/install.py:124 msgid "Messaging CRM Campagin" msgstr "" @@ -30812,17 +30871,17 @@ msgstr "" msgid "Miscellaneous Expenses" msgstr "" -#: erpnext/controllers/buying_controller.py:602 +#: erpnext/controllers/buying_controller.py:590 msgid "Mismatch" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1429 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1430 msgid "Missing" msgstr "" #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:69 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:183 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:587 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:586 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2218 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2818 #: erpnext/assets/doctype/asset_category/asset_category.py:116 @@ -30834,7 +30893,7 @@ msgid "Missing Asset" msgstr "" #: erpnext/accounts/doctype/gl_entry/gl_entry.py:178 -#: erpnext/assets/doctype/asset/asset.py:311 +#: erpnext/assets/doctype/asset/asset.py:308 msgid "Missing Cost Center" msgstr "" @@ -30842,11 +30901,11 @@ msgstr "" msgid "Missing Default in Company" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:353 +#: erpnext/assets/doctype/asset/asset.py:350 msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1366 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1375 msgid "Missing Finished Good" msgstr "" @@ -30854,7 +30913,7 @@ msgstr "" msgid "Missing Formula" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:791 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:792 msgid "Missing Item" msgstr "" @@ -31347,7 +31406,7 @@ msgstr "" msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1382 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -31358,7 +31417,7 @@ msgstr "" #. Label of the must_be_whole_number (Check) field in DocType 'UOM' #: erpnext/manufacturing/doctype/work_order/work_order.py:1124 #: erpnext/setup/doctype/uom/uom.json -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:139 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:203 #: erpnext/utilities/transaction_base.py:560 msgid "Must be Whole Number" msgstr "" @@ -31533,7 +31592,7 @@ msgstr "" msgid "Needs Analysis" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1309 +#: erpnext/stock/serial_batch_bundle.py:1352 msgid "Negative Batch Quantity" msgstr "" @@ -31827,7 +31886,7 @@ msgstr "" msgid "Net total calculation precision loss" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:226 +#: erpnext/accounts/doctype/account/account_tree.js:231 msgid "New" msgstr "" @@ -32083,8 +32142,8 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:624 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:645 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:623 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:644 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/projects/doctype/project/project.json @@ -32127,11 +32186,11 @@ msgstr "" msgid "No Delivery Note selected for Customer {}" msgstr "" -#: erpnext/stock/get_item_details.py:299 +#: erpnext/stock/get_item_details.py:302 msgid "No Item with Barcode {0}" msgstr "" -#: erpnext/stock/get_item_details.py:303 +#: erpnext/stock/get_item_details.py:306 msgid "No Item with Serial No {0}" msgstr "" @@ -32163,9 +32222,9 @@ msgstr "" msgid "No POS Profile found. Please create a New POS Profile first" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1540 -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1600 -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1614 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1618 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1692 #: erpnext/stock/doctype/item/item.py:1363 msgid "No Permission" msgstr "" @@ -32179,7 +32238,7 @@ msgstr "" msgid "No Records for these settings." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:333 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:332 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1047 msgid "No Remarks" msgstr "" @@ -32225,7 +32284,7 @@ msgid "No Work Orders were created" msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:794 -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:736 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:742 msgid "No accounting entries for the following warehouses" msgstr "" @@ -32261,6 +32320,10 @@ msgstr "" msgid "No description given" msgstr "" +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:220 +msgid "No difference found for stock account {0}" +msgstr "" + #: erpnext/telephony/doctype/call_log/call_log.py:117 msgid "No employee was scheduled for call popup" msgstr "" @@ -32521,7 +32584,9 @@ msgid "Not Billed" msgstr "" #. Option for the 'Delivery Status' (Select) field in DocType 'Sales Order' +#. Option for the 'Delivery Status' (Select) field in DocType 'Pick List' #: erpnext/selling/doctype/sales_order/sales_order.json +#: erpnext/stock/doctype/pick_list/pick_list.json msgid "Not Delivered" msgstr "" @@ -32599,9 +32664,9 @@ msgstr "" #: erpnext/buying/doctype/purchase_order/purchase_order.py:724 #: erpnext/manufacturing/doctype/work_order/work_order.py:1833 #: erpnext/manufacturing/doctype/work_order/work_order.py:1991 -#: erpnext/manufacturing/doctype/work_order/work_order.py:2058 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2060 #: erpnext/selling/doctype/sales_order/sales_order.py:824 -#: erpnext/selling/doctype/sales_order/sales_order.py:1654 +#: erpnext/selling/doctype/sales_order/sales_order.py:1660 msgid "Not permitted" msgstr "" @@ -32612,7 +32677,7 @@ msgstr "" #: erpnext/crm/doctype/crm_note/crm_note.json #: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:100 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:1036 -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1745 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1746 #: erpnext/projects/doctype/timesheet/timesheet.json #: erpnext/public/js/controllers/buying.js:476 #: erpnext/selling/doctype/customer/customer.py:129 @@ -32620,7 +32685,7 @@ msgstr "" #: erpnext/stock/doctype/item/item.js:526 #: erpnext/stock/doctype/item/item.py:571 #: erpnext/stock/doctype/item_price/item_price.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1374 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1383 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:973 #: erpnext/templates/pages/timelog_info.html:43 msgid "Note" @@ -32630,7 +32695,7 @@ msgstr "" msgid "Note: Automatic log deletion only applies to logs of type Update Cost" msgstr "" -#: erpnext/accounts/party.py:696 +#: erpnext/accounts/party.py:698 msgid "Note: Due Date exceeds allowed {0} credit days by {1} day(s)" msgstr "" @@ -32660,7 +32725,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:1019 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1097 msgid "Note: {0}" msgstr "" @@ -32683,7 +32748,7 @@ msgstr "" #: erpnext/crm/doctype/prospect/prospect.json #: erpnext/projects/doctype/project/project.json #: erpnext/quality_management/doctype/quality_review/quality_review.json -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js:34 #: erpnext/stock/doctype/manufacturer/manufacturer.json #: erpnext/www/book_appointment/index.html:55 msgid "Notes" @@ -33033,7 +33098,7 @@ msgstr "" msgid "Once set, this invoice will be on hold till the set date" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:686 +#: erpnext/manufacturing/doctype/work_order/work_order.js:679 msgid "Once the Work Order is Closed. It can't be resumed." msgstr "" @@ -33107,7 +33172,7 @@ msgstr "" msgid "Only leaf nodes are allowed in transaction" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:967 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:968 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -33286,7 +33351,7 @@ msgstr "" msgid "Open a new ticket" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:377 +#: erpnext/accounts/report/general_ledger/general_ledger.py:378 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "" @@ -33367,7 +33432,7 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Accounting Workspace #. Label of a Link in the Home Workspace -#: erpnext/accounts/doctype/account/account_tree.js:192 +#: erpnext/accounts/doctype/account/account_tree.js:197 #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json #: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/setup/workspace/home/home.json @@ -33383,7 +33448,7 @@ msgstr "" msgid "Opening Invoice Item" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1625 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1624 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1805 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 "" @@ -33498,7 +33563,7 @@ msgstr "" #: erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json #: erpnext/manufacturing/doctype/operation/operation.json #: erpnext/manufacturing/doctype/sub_operation/sub_operation.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:282 +#: erpnext/manufacturing/doctype/work_order/work_order.js:293 #: erpnext/manufacturing/doctype/work_order_item/work_order_item.json #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:31 @@ -33537,7 +33602,7 @@ msgstr "" msgid "Operation ID" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:296 +#: erpnext/manufacturing/doctype/work_order/work_order.js:307 msgid "Operation Id" msgstr "" @@ -33580,11 +33645,11 @@ msgstr "" msgid "Operation time does not depend on quantity to produce" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:474 +#: erpnext/manufacturing/doctype/job_card/job_card.js:472 msgid "Operation {0} added multiple times in the work order {1}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1083 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1091 msgid "Operation {0} does not belong to the work order {1}" msgstr "" @@ -33600,7 +33665,7 @@ msgstr "" #. Label of the operations (Table) field in DocType 'Work Order' #. Label of the operation (Section Break) field in DocType 'Email Digest' #: erpnext/manufacturing/doctype/bom/bom.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:277 +#: erpnext/manufacturing/doctype/work_order/work_order.js:288 #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/setup/doctype/company/company.py:372 #: erpnext/setup/doctype/email_digest/email_digest.json @@ -33772,11 +33837,11 @@ msgstr "" msgid "Optimize Route" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:169 +#: erpnext/accounts/doctype/account/account_tree.js:174 msgid "Optional. Sets company's default currency, if not specified." msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:156 +#: erpnext/accounts/doctype/account/account_tree.js:161 msgid "Optional. This setting will be used to filter in various transactions." msgstr "" @@ -34069,7 +34134,7 @@ msgstr "" msgid "Out of Order" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:542 +#: erpnext/stock/doctype/pick_list/pick_list.py:559 msgid "Out of Stock" msgstr "" @@ -34143,7 +34208,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:149 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1127 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1128 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:167 #: erpnext/accounts/report/purchase_register/purchase_register.py:289 #: erpnext/accounts/report/sales_register/sales_register.py:319 @@ -34182,7 +34247,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1249 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1251 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -34200,11 +34265,11 @@ msgstr "" msgid "Over Picking Allowance" msgstr "" -#: erpnext/controllers/stock_controller.py:1363 +#: erpnext/controllers/stock_controller.py:1453 msgid "Over Receipt" msgstr "" -#: erpnext/controllers/status_updater.py:401 +#: erpnext/controllers/status_updater.py:412 msgid "Over Receipt/Delivery of {0} {1} ignored for item {2} because you have {3} role." msgstr "" @@ -34219,7 +34284,7 @@ msgstr "" msgid "Over Transfer Allowance (%)" msgstr "" -#: erpnext/controllers/status_updater.py:403 +#: erpnext/controllers/status_updater.py:414 msgid "Overbilling of {0} {1} ignored for item {2} because you have {3} role." msgstr "" @@ -34620,7 +34685,7 @@ msgstr "" msgid "Packed Items" msgstr "" -#: erpnext/controllers/stock_controller.py:1201 +#: erpnext/controllers/stock_controller.py:1291 msgid "Packed Items cannot be transferred internally" msgstr "" @@ -34644,7 +34709,7 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Stock Workspace -#: erpnext/stock/doctype/delivery_note/delivery_note.js:244 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:293 #: erpnext/stock/doctype/packing_slip/packing_slip.json #: erpnext/stock/workspace/stock/stock.json msgid "Packing Slip" @@ -34655,7 +34720,7 @@ msgstr "" msgid "Packing Slip Item" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:626 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:638 msgid "Packing Slip(s) cancelled" msgstr "" @@ -34736,7 +34801,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:146 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1121 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1122 #: 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 @@ -34790,7 +34855,7 @@ msgstr "" msgid "Paid To Account Type" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:323 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:322 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1093 msgid "Paid amount + Write Off Amount can not be greater than Grand Total" msgstr "" @@ -35017,7 +35082,7 @@ msgstr "" msgid "Partial Payment in POS Transactions are not allowed." msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1476 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1548 msgid "Partial Stock Reservation" msgstr "" @@ -35118,7 +35183,10 @@ msgid "Partly Billed" msgstr "" #. Option for the 'Delivery Status' (Select) field in DocType 'Sales Order' +#. Option for the 'Status' (Select) field in DocType 'Pick List' +#. Option for the 'Delivery Status' (Select) field in DocType 'Pick List' #: erpnext/selling/doctype/sales_order/sales_order.json +#: erpnext/stock/doctype/pick_list/pick_list.json msgid "Partly Delivered" msgstr "" @@ -35198,12 +35266,12 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:142 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:159 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:57 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1058 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1059 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:67 #: 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:712 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:155 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35224,7 +35292,7 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/party_account/party_account.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1069 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1070 msgid "Party Account" msgstr "" @@ -35357,12 +35425,12 @@ msgstr "" #: erpnext/accounts/report/accounts_payable/accounts_payable.js:84 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:54 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:44 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1052 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1053 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:54 #: 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:711 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:151 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35379,7 +35447,7 @@ msgstr "" msgid "Party Type" msgstr "" -#: erpnext/accounts/party.py:825 +#: erpnext/accounts/party.py:827 msgid "Party Type and Party can only be set for Receivable / Payable account

{0}" msgstr "" @@ -35392,6 +35460,7 @@ msgid "Party Type and Party is required for Receivable / Payable account {0}" msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:516 +#: erpnext/accounts/party.py:428 msgid "Party Type is mandatory" msgstr "" @@ -35456,7 +35525,7 @@ msgstr "" msgid "Pause" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:176 +#: erpnext/manufacturing/doctype/job_card/job_card.js:175 msgid "Pause Job" msgstr "" @@ -35501,7 +35570,7 @@ msgid "Payable" msgstr "" #: erpnext/accounts/report/accounts_payable/accounts_payable.js:42 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1067 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1068 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:211 #: erpnext/accounts/report/purchase_register/purchase_register.py:194 #: erpnext/accounts/report/purchase_register/purchase_register.py:235 @@ -35533,7 +35602,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88 #: erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py:25 #: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:42 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:445 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:459 #: erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py:24 #: erpnext/selling/doctype/sales_order/sales_order.js:758 #: erpnext/selling/doctype/sales_order/sales_order_dashboard.py:31 @@ -35875,7 +35944,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126 #: erpnext/accounts/workspace/receivables/receivables.json -#: erpnext/buying/doctype/purchase_order/purchase_order.js:453 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:467 #: erpnext/selling/doctype/sales_order/sales_order.js:751 msgid "Payment Request" msgstr "" @@ -35949,7 +36018,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_schedule/payment_schedule.json #: erpnext/accounts/doctype/payment_term/payment_term.json #: erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1117 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1118 #: erpnext/accounts/report/gross_profit/gross_profit.py:412 #: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:30 @@ -36059,7 +36128,7 @@ msgstr "" msgid "Payment Unlink Error" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:887 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:965 msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}" msgstr "" @@ -36149,6 +36218,22 @@ msgstr "" msgid "Peck (US)" msgstr "" +#. Label of the pegged_against (Link) field in DocType 'Pegged Currency +#. Details' +#: erpnext/accounts/doctype/pegged_currency_details/pegged_currency_details.json +msgid "Pegged Against" +msgstr "" + +#. Name of a DocType +#: erpnext/accounts/doctype/pegged_currencies/pegged_currencies.json +msgid "Pegged Currencies" +msgstr "" + +#. Name of a DocType +#: erpnext/accounts/doctype/pegged_currency_details/pegged_currency_details.json +msgid "Pegged Currency Details" +msgstr "" + #. Option for the 'Status' (Select) field in DocType 'Bank Statement Import' #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' #. Option for the 'Status' (Select) field in DocType 'Ledger Merge' @@ -36195,7 +36280,7 @@ msgstr "" #. Label of the pending_qty (Float) field in DocType 'Production Plan Item' #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:254 #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:301 +#: erpnext/manufacturing/doctype/work_order/work_order.js:312 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:183 #: erpnext/selling/doctype/sales_order/sales_order.js:1205 #: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45 @@ -36279,6 +36364,8 @@ msgstr "" #. Item' #. Option for the 'Margin Type' (Select) field in DocType 'Sales Invoice Item' #. Option for the 'Margin Type' (Select) field in DocType 'Purchase Order Item' +#. Option for the 'Margin Type' (Select) field in DocType 'Supplier Quotation +#. Item' #. Option for the 'Margin Type' (Select) field in DocType 'Quotation Item' #. Option for the 'Margin Type' (Select) field in DocType 'Sales Order Item' #. Option for the 'Margin Type' (Select) field in DocType 'Delivery Note Item' @@ -36292,6 +36379,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json +#: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -36449,6 +36537,27 @@ msgstr "" msgid "Period_from_date" msgstr "" +#. Label of the section_break_tcvw (Section Break) field in DocType 'Journal +#. Entry' +#: erpnext/accounts/doctype/journal_entry/journal_entry.json +msgid "Periodic Accounting" +msgstr "" + +#. Option for the 'Entry Type' (Select) field in DocType 'Journal Entry' +#: erpnext/accounts/doctype/journal_entry/journal_entry.json +msgid "Periodic Accounting Entry" +msgstr "" + +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:246 +msgid "Periodic Accounting Entry is not allowed for company {0} with perpetual inventory enabled" +msgstr "" + +#. Label of the periodic_entry_difference_account (Link) field in DocType +#. 'Journal Entry' +#: erpnext/accounts/doctype/journal_entry/journal_entry.json +msgid "Periodic Entry Difference Account" +msgstr "" + #. Label of the periodicity (Data) field in DocType 'Asset Maintenance Log' #. Label of the periodicity (Select) field in DocType 'Asset Maintenance Task' #. Label of the periodicity (Select) field in DocType 'Maintenance Schedule @@ -36546,15 +36655,14 @@ msgstr "" msgid "Phone Number" msgstr "" -#. Label of the pick_list (Link) field in DocType 'Delivery Note' #. Name of a DocType #. Label of the pick_list (Link) field in DocType 'Stock Entry' #. Option for the 'From Voucher Type' (Select) field in DocType 'Stock #. Reservation Entry' #. Label of a Link in the Stock Workspace #: erpnext/selling/doctype/sales_order/sales_order.js:631 -#: erpnext/stock/doctype/delivery_note/delivery_note.json -#: erpnext/stock/doctype/material_request/material_request.js:123 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:199 +#: erpnext/stock/doctype/material_request/material_request.js:129 #: erpnext/stock/doctype/pick_list/pick_list.json #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json @@ -36562,7 +36670,7 @@ msgstr "" msgid "Pick List" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:196 +#: erpnext/stock/doctype/pick_list/pick_list.py:212 msgid "Pick List Incomplete" msgstr "" @@ -36853,7 +36961,7 @@ msgstr "" msgid "Plants and Machineries" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:539 +#: erpnext/stock/doctype/pick_list/pick_list.py:556 msgid "Please Restock Items and Update the Pick List to continue. To discontinue, cancel the Pick List." msgstr "" @@ -36866,6 +36974,7 @@ msgid "Please Select a Company." msgstr "" #: erpnext/stock/doctype/delivery_note/delivery_note.js:165 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:204 msgid "Please Select a Customer" msgstr "" @@ -36915,7 +37024,7 @@ msgstr "" msgid "Please add the Bank Account column" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:230 +#: erpnext/accounts/doctype/account/account_tree.js:235 msgid "Please add the account to root level Company - {0}" msgstr "" @@ -36927,7 +37036,7 @@ msgstr "" msgid "Please add {1} role to user {0}." msgstr "" -#: erpnext/controllers/stock_controller.py:1374 +#: erpnext/controllers/stock_controller.py:1464 msgid "Please adjust the qty or edit {0} to proceed." msgstr "" @@ -36948,7 +37057,7 @@ msgstr "" msgid "Please cancel related transaction." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:961 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1039 msgid "Please check Multi Currency option to allow accounts with other currency" msgstr "" @@ -37005,7 +37114,7 @@ msgstr "" msgid "Please create Customer from Lead {0}." msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:117 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:121 msgid "Please create Landed Cost Vouchers against Invoices that have 'Update Stock' enabled." msgstr "" @@ -37017,7 +37126,7 @@ msgstr "" msgid "Please create purchase from internal sale or delivery document itself" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:393 +#: erpnext/assets/doctype/asset/asset.py:390 msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "" @@ -37029,7 +37138,7 @@ msgstr "" msgid "Please disable workflow temporarily for Journal Entry {0}" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:432 +#: erpnext/assets/doctype/asset/asset.py:429 msgid "Please do not book expense of multiple assets against one single Asset." msgstr "" @@ -37045,7 +37154,7 @@ msgstr "" msgid "Please enable Applicable on Purchase Order and Applicable on Booking Actual Expenses" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:246 +#: erpnext/stock/doctype/pick_list/pick_list.py:262 msgid "Please enable Use Old Serial / Batch Fields to make_bundle" msgstr "" @@ -37059,7 +37168,7 @@ msgstr "" msgid "Please enable pop-ups" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:572 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:636 msgid "Please enable {0} in the {1}." msgstr "" @@ -37067,11 +37176,11 @@ msgstr "" msgid "Please enable {} in {} to allow same item in multiple rows" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:366 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:365 msgid "Please ensure that the {0} account is a Balance Sheet account. You can change the parent account to a Balance Sheet account or select a different account." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:374 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:373 msgid "Please ensure that the {0} account {1} is a Payable account. You can change the account type to Payable or select a different account." msgstr "" @@ -37083,7 +37192,7 @@ msgstr "" msgid "Please ensure {} account {} is a Receivable account." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:521 msgid "Please enter Difference Account or set default Stock Adjustment Account for company {0}" msgstr "" @@ -37141,15 +37250,15 @@ msgstr "" msgid "Please enter Production Item first" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js:76 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js:72 msgid "Please enter Purchase Receipt first" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:98 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:102 msgid "Please enter Receipt Document" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1025 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1103 msgid "Please enter Reference date" msgstr "" @@ -37169,7 +37278,7 @@ msgstr "" msgid "Please enter Warehouse and Date" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:652 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:651 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1152 msgid "Please enter Write Off Account" msgstr "" @@ -37218,11 +37327,11 @@ msgstr "" msgid "Please enter the phone number first" msgstr "" -#: erpnext/controllers/buying_controller.py:1069 +#: erpnext/controllers/buying_controller.py:1057 msgid "Please enter the {schedule_date}." msgstr "" -#: erpnext/public/js/setup_wizard.js:93 +#: erpnext/public/js/setup_wizard.js:97 msgid "Please enter valid Financial Year Start and End Dates" msgstr "" @@ -37262,10 +37371,6 @@ msgstr "" msgid "Please import accounts against parent company or enable {} in company master." msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:176 -msgid "Please keep one Applicable Charges, when 'Distribute Charges Based On' is 'Distribute Manually'. For more charges, please create another Landed Cost Voucher." -msgstr "" - #: erpnext/setup/doctype/employee/employee.py:181 msgid "Please make sure the employees above report to another Active employee." msgstr "" @@ -37325,7 +37430,7 @@ msgstr "" msgid "Please select Apply Discount On" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1619 +#: erpnext/selling/doctype/sales_order/sales_order.py:1625 msgid "Please select BOM against item {0}" msgstr "" @@ -37333,7 +37438,7 @@ msgstr "" msgid "Please select BOM for Item in Row {0}" msgstr "" -#: erpnext/controllers/buying_controller.py:529 +#: erpnext/controllers/buying_controller.py:517 msgid "Please select BOM in BOM field for Item {item_code}." msgstr "" @@ -37351,7 +37456,7 @@ msgstr "" msgid "Please select Charge Type first" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:421 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:454 msgid "Please select Company" msgstr "" @@ -37360,7 +37465,7 @@ msgstr "" msgid "Please select Company and Posting Date to getting entries" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:663 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:696 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "" @@ -37399,11 +37504,15 @@ msgstr "" msgid "Please select Party Type first" msgstr "" +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:252 +msgid "Please select Periodic Accounting Entry Difference Account" +msgstr "" + #: erpnext/accounts/doctype/payment_entry/payment_entry.js:497 msgid "Please select Posting Date before selecting Party" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:664 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:697 msgid "Please select Posting Date first" msgstr "" @@ -37411,7 +37520,7 @@ msgstr "" msgid "Please select Price List" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1621 +#: erpnext/selling/doctype/sales_order/sales_order.py:1627 msgid "Please select Qty against item {0}" msgstr "" @@ -37419,7 +37528,7 @@ msgstr "" msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:323 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:386 msgid "Please select Serial/Batch Nos to reserve or change Reservation Based On to Qty." msgstr "" @@ -37427,7 +37536,11 @@ msgstr "" msgid "Please select Start Date and End Date for Item {0}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1288 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:271 +msgid "Please select Stock Asset Account" +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1297 msgid "Please select Subcontracting Order instead of Purchase Order {0}" msgstr "" @@ -37439,7 +37552,8 @@ msgstr "" msgid "Please select a BOM" msgstr "" -#: erpnext/accounts/party.py:428 +#: erpnext/accounts/party.py:430 +#: erpnext/stock/doctype/pick_list/pick_list.py:1557 msgid "Please select a Company" msgstr "" @@ -37471,7 +37585,7 @@ msgstr "" msgid "Please select a Warehouse" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1387 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1397 msgid "Please select a Work Order first." msgstr "" @@ -37528,7 +37642,7 @@ msgstr "" msgid "Please select atleast one item to continue" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1674 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1752 msgid "Please select correct account" msgstr "" @@ -37670,7 +37784,7 @@ msgstr "" msgid "Please set Fixed Asset Account in Asset Category {0}" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:584 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:583 msgid "Please set Fixed Asset Account in {} against {}." msgstr "" @@ -37704,11 +37818,11 @@ msgstr "" msgid "Please set a Company" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:308 +#: erpnext/assets/doctype/asset/asset.py:305 msgid "Please set a Cost Center for the Asset or set an Asset Depreciation Cost Center for the Company {}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1395 +#: erpnext/selling/doctype/sales_order/sales_order.py:1401 msgid "Please set a Supplier against the Items to be considered in the Purchase Order." msgstr "" @@ -37720,7 +37834,7 @@ msgstr "" msgid "Please set a default Holiday List for Employee {0} or Company {1}" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1094 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1093 msgid "Please set account in Warehouse {0}" msgstr "" @@ -37729,7 +37843,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "" -#: erpnext/controllers/stock_controller.py:753 +#: erpnext/controllers/stock_controller.py:758 msgid "Please set an Expense Account in the Items table" msgstr "" @@ -37773,7 +37887,7 @@ msgstr "" msgid "Please set default UOM in Stock Settings" msgstr "" -#: erpnext/controllers/stock_controller.py:614 +#: erpnext/controllers/stock_controller.py:619 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "" @@ -37794,7 +37908,7 @@ msgstr "" msgid "Please set one of the following:" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:509 +#: erpnext/assets/doctype/asset/asset.py:506 msgid "Please set opening number of booked depreciations" msgstr "" @@ -37810,15 +37924,15 @@ msgstr "" msgid "Please set the Default Cost Center in {0} company." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:607 +#: erpnext/manufacturing/doctype/work_order/work_order.js:600 msgid "Please set the Item Code first" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1449 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1459 msgid "Please set the Target Warehouse in the Job Card" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1453 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1463 msgid "Please set the WIP Warehouse in the Job Card" msgstr "" @@ -37873,7 +37987,7 @@ msgstr "" msgid "Please specify" msgstr "" -#: erpnext/stock/get_item_details.py:310 +#: erpnext/stock/get_item_details.py:313 msgid "Please specify Company" msgstr "" @@ -38078,14 +38192,14 @@ msgstr "" #: erpnext/accounts/report/accounts_payable/accounts_payable.js:16 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:15 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:18 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1050 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1051 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:15 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:35 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:7 #: 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:639 #: 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:203 @@ -38193,7 +38307,7 @@ msgstr "" msgid "Posting Time" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1887 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1957 msgid "Posting date and posting time is mandatory" msgstr "" @@ -38468,7 +38582,7 @@ msgstr "" msgid "Price List Currency" msgstr "" -#: erpnext/stock/get_item_details.py:1230 +#: erpnext/stock/get_item_details.py:1233 msgid "Price List Currency not selected" msgstr "" @@ -38943,7 +39057,7 @@ msgstr "" msgid "Print Style" msgstr "" -#: erpnext/setup/install.py:100 +#: erpnext/setup/install.py:101 msgid "Print UOM after Quantity" msgstr "" @@ -38961,7 +39075,7 @@ msgstr "" msgid "Print settings updated in respective print format" msgstr "" -#: erpnext/setup/install.py:107 +#: erpnext/setup/install.py:108 msgid "Print taxes with zero amount" msgstr "" @@ -39143,7 +39257,7 @@ msgstr "" msgid "Process Loss Qty" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:253 +#: erpnext/manufacturing/doctype/job_card/job_card.js:252 msgid "Process Loss Quantity" msgstr "" @@ -39614,7 +39728,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:716 #: 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 @@ -40140,7 +40254,7 @@ msgstr "" #: erpnext/accounts/workspace/payables/payables.json #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json -#: erpnext/buying/doctype/purchase_order/purchase_order.js:436 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:450 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 #: erpnext/buying/workspace/buying/buying.json @@ -40183,7 +40297,7 @@ msgstr "" msgid "Purchase Invoice Trends" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:270 +#: erpnext/assets/doctype/asset/asset.py:267 msgid "Purchase Invoice cannot be made against an existing asset {0}" msgstr "" @@ -40192,7 +40306,7 @@ msgstr "" msgid "Purchase Invoice {0} is already submitted" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2010 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2009 msgid "Purchase Invoices" msgstr "" @@ -40259,7 +40373,7 @@ msgstr "" #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js:48 #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:203 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/buying_controller.py:801 +#: erpnext/controllers/buying_controller.py:789 #: erpnext/crm/doctype/contract/contract.json #: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:54 #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json @@ -40268,7 +40382,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json -#: erpnext/stock/doctype/material_request/material_request.js:162 +#: erpnext/stock/doctype/material_request/material_request.js:168 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:246 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -40332,7 +40446,7 @@ msgstr "" msgid "Purchase Order Item Supplied" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:782 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:837 msgid "Purchase Order Item reference is missing in Subcontracting Receipt {0}" msgstr "" @@ -40345,11 +40459,11 @@ msgstr "" msgid "Purchase Order Pricing Rule" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:623 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:622 msgid "Purchase Order Required" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:618 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:617 msgid "Purchase Order Required for item {}" msgstr "" @@ -40369,7 +40483,7 @@ msgstr "" msgid "Purchase Order number required for Item {0}" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:661 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:660 msgid "Purchase Order {0} is not submitted" msgstr "" @@ -40431,7 +40545,7 @@ msgstr "" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.js:22 #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:21 #: erpnext/assets/doctype/asset/asset.json -#: erpnext/buying/doctype/purchase_order/purchase_order.js:403 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:417 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json @@ -40477,7 +40591,6 @@ msgstr "" #. Label of the purchase_receipt_items (Section Break) field in DocType 'Landed #. Cost Voucher' -#. Label of the items (Table) field in DocType 'Landed Cost Voucher' #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json msgid "Purchase Receipt Items" msgstr "" @@ -40487,11 +40600,11 @@ msgstr "" msgid "Purchase Receipt No" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:644 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:643 msgid "Purchase Receipt Required" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:639 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:638 msgid "Purchase Receipt Required for item {}" msgstr "" @@ -40508,20 +40621,14 @@ msgstr "" msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled." msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:859 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:914 msgid "Purchase Receipt {0} created." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:668 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:667 msgid "Purchase Receipt {0} is not submitted" msgstr "" -#. Label of the purchase_receipts (Table) field in DocType 'Landed Cost -#. Voucher' -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json -msgid "Purchase Receipts" -msgstr "" - #. Name of a report #. Label of a Link in the Payables Workspace #: erpnext/accounts/report/purchase_register/purchase_register.json @@ -40660,7 +40767,7 @@ msgstr "" msgid "Purpose" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:367 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:368 msgid "Purpose must be one of {0}" msgstr "" @@ -40887,7 +40994,7 @@ msgstr "" msgid "Qty for which recursion isn't applicable." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:901 +#: erpnext/manufacturing/doctype/work_order/work_order.js:894 msgid "Qty for {0}" msgstr "" @@ -40906,12 +41013,12 @@ msgid "Qty in WIP Warehouse" msgstr "" #. Label of the for_qty (Float) field in DocType 'Pick List' -#: erpnext/stock/doctype/pick_list/pick_list.js:181 +#: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/pick_list/pick_list.json msgid "Qty of Finished Goods Item" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:587 +#: erpnext/stock/doctype/pick_list/pick_list.py:603 msgid "Qty of Finished Goods Item should be greater than 0." msgstr "" @@ -40944,8 +41051,8 @@ msgstr "" msgid "Qty to Fetch" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:225 -#: erpnext/manufacturing/doctype/job_card/job_card.py:757 +#: erpnext/manufacturing/doctype/job_card/job_card.js:224 +#: erpnext/manufacturing/doctype/job_card/job_card.py:765 msgid "Qty to Manufacture" msgstr "" @@ -41294,7 +41401,7 @@ msgstr "" #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:67 #: erpnext/stock/dashboard/item_dashboard.js:245 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json -#: erpnext/stock/doctype/material_request/material_request.js:329 +#: erpnext/stock/doctype/material_request/material_request.js:335 #: erpnext/stock/doctype/material_request_item/material_request_item.json #: erpnext/stock/doctype/packing_slip_item/packing_slip_item.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json @@ -41397,7 +41504,7 @@ msgstr "" msgid "Quantity cannot be greater than {0} for Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1356 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1365 msgid "Quantity in row {0} ({1}) must be same as manufactured quantity {2}" msgstr "" @@ -41409,8 +41516,8 @@ msgstr "" msgid "Quantity must be greater than zero, and less or equal to {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:933 -#: erpnext/stock/doctype/pick_list/pick_list.js:189 +#: erpnext/manufacturing/doctype/work_order/work_order.js:926 +#: erpnext/stock/doctype/pick_list/pick_list.js:183 msgid "Quantity must not be more than {0}" msgstr "" @@ -41424,8 +41531,8 @@ msgid "Quantity required for Item {0} in row {1}" msgstr "" #: erpnext/manufacturing/doctype/bom/bom.py:604 -#: erpnext/manufacturing/doctype/job_card/job_card.js:282 -#: erpnext/manufacturing/doctype/job_card/job_card.js:351 +#: erpnext/manufacturing/doctype/job_card/job_card.js:280 +#: erpnext/manufacturing/doctype/job_card/job_card.js:349 #: erpnext/manufacturing/doctype/workstation/workstation.js:303 msgid "Quantity should be greater than 0" msgstr "" @@ -41434,11 +41541,11 @@ msgstr "" msgid "Quantity to Make" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:306 +#: erpnext/manufacturing/doctype/work_order/work_order.js:317 msgid "Quantity to Manufacture" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2134 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2136 msgid "Quantity to Manufacture can not be zero for the operation {0}" msgstr "" @@ -41519,7 +41626,7 @@ msgstr "" msgid "Query Route String" msgstr "" -#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:143 +#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:144 msgid "Queue Size should be between 5 and 100" msgstr "" @@ -41546,11 +41653,11 @@ msgstr "" msgid "Queued" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:58 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:91 msgid "Quick Entry" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:552 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:585 msgid "Quick Journal Entry" msgstr "" @@ -41862,6 +41969,8 @@ msgstr "" #. Item' #. Label of the rate_with_margin (Currency) field in DocType 'Purchase Order #. Item' +#. Label of the rate_with_margin (Currency) field in DocType 'Supplier +#. Quotation Item' #. Label of the rate_with_margin (Currency) field in DocType 'Quotation Item' #. Label of the rate_with_margin (Currency) field in DocType 'Sales Order Item' #. Label of the rate_with_margin (Currency) field in DocType 'Delivery Note @@ -41872,6 +41981,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json +#: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -42152,12 +42262,12 @@ msgstr "" msgid "Raw Materials cannot be blank." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:393 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:407 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:113 -#: erpnext/manufacturing/doctype/work_order/work_order.js:705 +#: erpnext/manufacturing/doctype/work_order/work_order.js:698 #: erpnext/selling/doctype/sales_order/sales_order.js:590 #: erpnext/selling/doctype/sales_order/sales_order_list.js:70 -#: erpnext/stock/doctype/material_request/material_request.js:209 +#: erpnext/stock/doctype/material_request/material_request.js:215 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:164 msgid "Re-open" msgstr "" @@ -42261,7 +42371,7 @@ msgstr "" msgid "Reason for Failure" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:731 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:745 #: erpnext/selling/doctype/sales_order/sales_order.js:1326 msgid "Reason for Hold" msgstr "" @@ -42324,6 +42434,17 @@ msgstr "" msgid "Receipt Document Type" msgstr "" +#. Label of the items (Table) field in DocType 'Landed Cost Voucher' +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json +msgid "Receipt Items" +msgstr "" + +#. Label of the purchase_receipts (Table) field in DocType 'Landed Cost +#. Voucher' +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json +msgid "Receipts" +msgstr "" + #. Option for the 'Account Type' (Select) field in DocType 'Account' #. Option for the 'Account Type' (Select) field in DocType 'Payment Ledger #. Entry' @@ -42342,7 +42463,7 @@ msgid "Receivable / Payable Account" msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:71 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1065 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1066 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:244 #: erpnext/accounts/report/sales_register/sales_register.py:217 #: erpnext/accounts/report/sales_register/sales_register.py:271 @@ -42813,7 +42934,7 @@ msgstr "" msgid "Reference" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1101 msgid "Reference #{0} dated {1}" msgstr "" @@ -42951,7 +43072,7 @@ msgstr "" msgid "Reference No" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:715 msgid "Reference No & Reference Date is required for {0}" msgstr "" @@ -42959,7 +43080,7 @@ msgstr "" msgid "Reference No and Reference Date is mandatory for Bank transaction" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:642 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:720 msgid "Reference No is mandatory if you entered Reference Date" msgstr "" @@ -43077,11 +43198,11 @@ msgstr "" msgid "References" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:373 +#: 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:368 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:378 msgid "References to Sales Orders are Incomplete" msgstr "" @@ -43233,7 +43354,7 @@ msgstr "" msgid "Release Date" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:314 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:313 msgid "Release date must be in the future" msgstr "" @@ -43252,7 +43373,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:187 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:156 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1139 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1140 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:178 msgid "Remaining Balance" msgstr "" @@ -43305,10 +43426,10 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:159 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:198 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:269 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1171 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1172 #: 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:741 #: 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 @@ -43342,7 +43463,7 @@ msgstr "" msgid "Remove SABB Entry" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js:34 msgid "Remove item if charges is not applicable to that item" msgstr "" @@ -43405,7 +43526,7 @@ msgstr "" #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:58 #: erpnext/crm/doctype/opportunity/opportunity.js:130 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:305 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:354 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:305 #: erpnext/support/doctype/issue/issue.js:39 msgid "Reopen" @@ -43545,7 +43666,7 @@ msgstr "" msgid "Report View" msgstr "" -#: erpnext/setup/install.py:153 +#: erpnext/setup/install.py:154 msgid "Report an Issue" msgstr "" @@ -43750,7 +43871,7 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:70 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:272 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/doctype/material_request/material_request.js:168 +#: erpnext/stock/doctype/material_request/material_request.js:174 msgid "Request for Quotation" msgstr "" @@ -43959,9 +44080,9 @@ msgstr "" msgid "Reservation Based On" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:815 +#: erpnext/manufacturing/doctype/work_order/work_order.js:808 #: erpnext/selling/doctype/sales_order/sales_order.js:76 -#: erpnext/stock/doctype/pick_list/pick_list.js:133 +#: erpnext/stock/doctype/pick_list/pick_list.js:127 msgid "Reserve" msgstr "" @@ -44009,7 +44130,7 @@ msgstr "" msgid "Reserved Qty" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:135 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:199 msgid "Reserved Qty ({0}) cannot be a fraction. To allow this, disable '{1}' in UOM {3}." msgstr "" @@ -44039,7 +44160,7 @@ msgstr "" msgid "Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items." msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:513 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:577 msgid "Reserved Qty should be greater than Delivered Qty." msgstr "" @@ -44055,27 +44176,27 @@ msgstr "" msgid "Reserved Quantity for Production" msgstr "" -#: erpnext/stock/stock_ledger.py:2161 +#: erpnext/stock/stock_ledger.py:2164 msgid "Reserved Serial No." msgstr "" #. Label of the reserved_stock (Float) field in DocType 'Bin' #. Name of a report #: erpnext/manufacturing/doctype/plant_floor/stock_summary_template.html:24 -#: erpnext/manufacturing/doctype/work_order/work_order.js:831 +#: erpnext/manufacturing/doctype/work_order/work_order.js:824 #: erpnext/public/js/stock_reservation.js:235 #: erpnext/selling/doctype/sales_order/sales_order.js:99 #: erpnext/selling/doctype/sales_order/sales_order.js:428 #: erpnext/stock/dashboard/item_dashboard_list.html:15 #: erpnext/stock/doctype/bin/bin.json -#: erpnext/stock/doctype/pick_list/pick_list.js:153 +#: erpnext/stock/doctype/pick_list/pick_list.js:147 #: erpnext/stock/report/reserved_stock/reserved_stock.json #: erpnext/stock/report/stock_balance/stock_balance.py:499 -#: erpnext/stock/stock_ledger.py:2145 +#: erpnext/stock/stock_ledger.py:2148 msgid "Reserved Stock" msgstr "" -#: erpnext/stock/stock_ledger.py:2191 +#: erpnext/stock/stock_ledger.py:2194 msgid "Reserved Stock for Batch" msgstr "" @@ -44087,7 +44208,7 @@ msgstr "" msgid "Reserved Stock for Sub-assembly" msgstr "" -#: erpnext/controllers/buying_controller.py:538 +#: erpnext/controllers/buying_controller.py:526 msgid "Reserved Warehouse is mandatory for the Item {item_code} in Raw Materials supplied." msgstr "" @@ -44121,7 +44242,7 @@ msgstr "" #: erpnext/public/js/stock_reservation.js:202 #: erpnext/selling/doctype/sales_order/sales_order.js:381 -#: erpnext/stock/doctype/pick_list/pick_list.js:278 +#: erpnext/stock/doctype/pick_list/pick_list.js:272 msgid "Reserving Stock..." msgstr "" @@ -44334,13 +44455,13 @@ msgstr "" msgid "Result Title Field" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:368 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:382 #: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:63 #: erpnext/selling/doctype/sales_order/sales_order.js:576 msgid "Resume" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:160 +#: erpnext/manufacturing/doctype/job_card/job_card.js:159 msgid "Resume Job" msgstr "" @@ -44449,7 +44570,7 @@ msgstr "" msgid "Return Against Subcontracting Receipt" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:247 +#: erpnext/manufacturing/doctype/work_order/work_order.js:258 msgid "Return Components" msgstr "" @@ -44479,7 +44600,7 @@ msgstr "" msgid "Return invoice of asset cancelled" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:118 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:132 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:208 msgid "Return of Components" msgstr "" @@ -44568,7 +44689,7 @@ msgstr "" msgid "Reversal Of" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:49 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:82 msgid "Reverse Journal Entry" msgstr "" @@ -44691,7 +44812,7 @@ msgstr "" #. Label of the root_type (Select) field in DocType 'Account' #. Label of the root_type (Select) field in DocType 'Ledger Merge' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/account_tree.js:146 +#: erpnext/accounts/doctype/account/account_tree.js:151 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json #: erpnext/accounts/report/account_balance/account_balance.js:22 msgid "Root Type" @@ -44875,8 +44996,8 @@ msgstr "" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "" -#: erpnext/controllers/stock_controller.py:626 -#: erpnext/controllers/stock_controller.py:641 +#: erpnext/controllers/stock_controller.py:631 +#: erpnext/controllers/stock_controller.py:646 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "" @@ -44955,11 +45076,11 @@ msgid "Row #{0}: Acceptance Criteria Formula is required." msgstr "" #: erpnext/controllers/subcontracting_controller.py:72 -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:487 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:492 msgid "Row #{0}: Accepted Warehouse and Rejected Warehouse cannot be same" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:480 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:485 msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}" msgstr "" @@ -44980,7 +45101,7 @@ msgstr "" msgid "Row #{0}: Allocated amount:{1} is greater than outstanding amount:{2} for Payment Term {3}" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:296 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:294 msgid "Row #{0}: Amount must be a positive number" msgstr "" @@ -44996,7 +45117,7 @@ msgstr "" msgid "Row #{0}: BOM is not specified for subcontracting item {0}" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:313 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:376 msgid "Row #{0}: Batch No {1} is already selected." msgstr "" @@ -45028,7 +45149,7 @@ msgstr "" msgid "Row #{0}: Cannot set Rate if the billed amount is greater than the amount for Item {1}." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:964 +#: erpnext/manufacturing/doctype/job_card/job_card.py:972 msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}" msgstr "" @@ -45036,23 +45157,23 @@ msgstr "" msgid "Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:271 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:269 msgid "Row #{0}: Consumed Asset {1} cannot be Draft" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:274 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:272 msgid "Row #{0}: Consumed Asset {1} cannot be cancelled" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:256 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:254 msgid "Row #{0}: Consumed Asset {1} cannot be the same as the Target Asset" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:265 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:263 msgid "Row #{0}: Consumed Asset {1} cannot be {2}" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:279 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:277 msgid "Row #{0}: Consumed Asset {1} does not belong to company {2}" msgstr "" @@ -45072,7 +45193,7 @@ msgstr "" msgid "Row #{0}: Default BOM not found for FG Item {1}" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:536 +#: erpnext/assets/doctype/asset/asset.py:533 msgid "Row #{0}: Depreciation Start Date is required" msgstr "" @@ -45084,7 +45205,7 @@ msgstr "" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "" -#: erpnext/controllers/stock_controller.py:755 +#: erpnext/controllers/stock_controller.py:760 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "" @@ -45100,11 +45221,11 @@ msgstr "" msgid "Row #{0}: Finished Good Item {1} must be a sub-contracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:327 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:328 msgid "Row #{0}: Finished Good must be {1}" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:468 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:473 msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}." msgstr "" @@ -45112,11 +45233,11 @@ msgstr "" msgid "Row #{0}: For {1} Clearance date {2} cannot be before Cheque Date {3}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:685 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:763 msgid "Row #{0}: For {1}, you can select reference document only if account gets credited" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:695 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:773 msgid "Row #{0}: For {1}, you can select reference document only if account gets debited" msgstr "" @@ -45124,7 +45245,7 @@ msgstr "" msgid "Row #{0}: From Date cannot be before To Date" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:747 +#: erpnext/manufacturing/doctype/job_card/job_card.py:755 msgid "Row #{0}: From Time and To Time fields are required" msgstr "" @@ -45140,11 +45261,11 @@ msgstr "" msgid "Row #{0}: Item {1} does not exist" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1380 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1452 msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List." msgstr "" -#: erpnext/controllers/stock_controller.py:98 +#: erpnext/controllers/stock_controller.py:99 msgid "Row #{0}: Item {1} has zero rate but 'Allow Zero Valuation Rate' is not enabled." msgstr "" @@ -45152,11 +45273,11 @@ msgstr "" msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:290 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:288 msgid "Row #{0}: Item {1} is not a service item" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:244 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:242 msgid "Row #{0}: Item {1} is not a stock item" msgstr "" @@ -45164,11 +45285,11 @@ msgstr "" msgid "Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:530 +#: erpnext/assets/doctype/asset/asset.py:527 msgid "Row #{0}: Next Depreciation Date cannot be before Available-for-use Date" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:525 +#: erpnext/assets/doctype/asset/asset.py:522 msgid "Row #{0}: Next Depreciation Date cannot be before Purchase Date" msgstr "" @@ -45176,15 +45297,15 @@ 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:1463 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1535 msgid "Row #{0}: Only {1} available to reserve for the Item {2}" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:502 +#: erpnext/assets/doctype/asset/asset.py:499 msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:671 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:672 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "" @@ -45216,24 +45337,24 @@ msgstr "" msgid "Row #{0}: Qty increased by {1}" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:247 -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:293 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:245 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:291 msgid "Row #{0}: Qty must be a positive number" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:301 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:364 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:1096 +#: erpnext/controllers/stock_controller.py:1186 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1111 +#: erpnext/controllers/stock_controller.py:1201 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1126 +#: erpnext/controllers/stock_controller.py:1216 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" @@ -45242,7 +45363,7 @@ msgstr "" msgid "Row #{0}: Quantity for Item {1} cannot be zero." msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1448 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1520 msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0." msgstr "" @@ -45261,7 +45382,7 @@ msgstr "" msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:461 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:466 msgid "Row #{0}: Rejected Qty cannot be set for Scrap Item {1}." msgstr "" @@ -45273,7 +45394,7 @@ msgstr "" msgid "Row #{0}: Return Against is required for returning asset" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:456 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:461 msgid "Row #{0}: Scrap Item Qty cannot be zero" msgstr "" @@ -45285,15 +45406,15 @@ msgid "" "\t\t\t\t\tthis validation." msgstr "" -#: erpnext/controllers/stock_controller.py:195 +#: erpnext/controllers/stock_controller.py:196 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:250 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:313 msgid "Row #{0}: Serial No {1} for Item {2} is not available in {3} {4} or might be reserved in another {5}." msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:266 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:329 msgid "Row #{0}: Serial No {1} is already selected." msgstr "" @@ -45325,40 +45446,40 @@ msgstr "" msgid "Row #{0}: Status is mandatory" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:467 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:545 msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:275 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:338 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:1393 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1465 msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1406 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1478 msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}." msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1420 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1492 msgid "Row #{0}: Stock is already reserved for the Item {1}." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:526 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:536 msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}." msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:285 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:348 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:1133 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1434 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1203 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1506 msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}." msgstr "" -#: erpnext/controllers/stock_controller.py:208 +#: erpnext/controllers/stock_controller.py:209 msgid "Row #{0}: The batch {1} has already expired." msgstr "" @@ -45370,7 +45491,7 @@ msgstr "" msgid "Row #{0}: Timings conflicts with row {1}" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:515 +#: erpnext/assets/doctype/asset/asset.py:512 msgid "Row #{0}: Total Number of Depreciations cannot be less than or equal to Opening Number of Booked Depreciations" msgstr "" @@ -45402,39 +45523,39 @@ msgstr "" msgid "Row #{1}: Warehouse is mandatory for stock Item {0}" msgstr "" -#: erpnext/controllers/buying_controller.py:269 +#: erpnext/controllers/buying_controller.py:257 msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "" -#: erpnext/controllers/buying_controller.py:468 +#: erpnext/controllers/buying_controller.py:456 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "" -#: erpnext/controllers/buying_controller.py:943 +#: erpnext/controllers/buying_controller.py:931 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:599 +#: erpnext/controllers/buying_controller.py:587 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:612 +#: erpnext/controllers/buying_controller.py:600 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:558 +#: erpnext/controllers/buying_controller.py:546 msgid "Row #{idx}: {field_label} is mandatory." msgstr "" -#: erpnext/controllers/buying_controller.py:580 +#: erpnext/controllers/buying_controller.py:568 msgid "Row #{idx}: {field_label} is not allowed in Purchase Return." msgstr "" -#: erpnext/controllers/buying_controller.py:260 +#: erpnext/controllers/buying_controller.py:248 msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "" -#: erpnext/controllers/buying_controller.py:1061 +#: erpnext/controllers/buying_controller.py:1049 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "" @@ -45442,7 +45563,7 @@ msgstr "" msgid "Row #{}: Currency of {} - {} doesn't matches company currency." msgstr "" -#: erpnext/assets/doctype/asset/asset.py:352 +#: erpnext/assets/doctype/asset/asset.py:349 msgid "Row #{}: Finance Book should not be empty since you're using multiple." msgstr "" @@ -45466,7 +45587,7 @@ msgstr "" msgid "Row #{}: Please assign task to a member." msgstr "" -#: erpnext/assets/doctype/asset/asset.py:344 +#: erpnext/assets/doctype/asset/asset.py:341 msgid "Row #{}: Please use a different Finance Book." msgstr "" @@ -45486,7 +45607,7 @@ msgstr "" msgid "Row #{}: You cannot add positive quantities in a return invoice. Please remove item {} to complete the return." msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:163 +#: erpnext/stock/doctype/pick_list/pick_list.py:179 msgid "Row #{}: item {} has been picked already." msgstr "" @@ -45503,7 +45624,7 @@ msgstr "" msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:433 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:432 msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}" msgstr "" @@ -45515,19 +45636,19 @@ msgstr "" msgid "Row {0}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:675 +#: erpnext/manufacturing/doctype/job_card/job_card.py:683 msgid "Row {0} : Operation is required against the raw material item {1}" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:193 +#: erpnext/stock/doctype/pick_list/pick_list.py:209 msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1219 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1228 msgid "Row {0}# Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1252 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" @@ -45535,7 +45656,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:600 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:678 msgid "Row {0}: Account {1} and Party Type {2} have different account types" msgstr "" @@ -45543,11 +45664,11 @@ msgstr "" msgid "Row {0}: Activity Type is mandatory." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:666 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744 msgid "Row {0}: Advance against Customer must be credit" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:668 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:746 msgid "Row {0}: Advance against Supplier must be debit" msgstr "" @@ -45559,7 +45680,7 @@ msgstr "" msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -45567,7 +45688,7 @@ msgstr "" msgid "Row {0}: Bill of Materials not found for the Item {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:919 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:997 msgid "Row {0}: Both Debit and Credit values cannot be zero" msgstr "" @@ -45579,11 +45700,11 @@ msgstr "" msgid "Row {0}: Cost Center {1} does not belong to Company {2}" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:137 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:141 msgid "Row {0}: Cost center is required for an item {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:765 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:843 msgid "Row {0}: Credit entry can not be linked with a {1}" msgstr "" @@ -45591,7 +45712,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:760 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:838 msgid "Row {0}: Debit entry can not be linked with a {1}" msgstr "" @@ -45607,24 +45728,24 @@ msgstr "" msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1010 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1088 #: erpnext/controllers/taxes_and_totals.py:1203 msgid "Row {0}: Exchange Rate is mandatory" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:477 +#: erpnext/assets/doctype/asset/asset.py:474 msgid "Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:524 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:523 msgid "Row {0}: Expense Head changed to {1} as no Purchase Receipt is created against Item {2}." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:481 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:480 msgid "Row {0}: Expense Head changed to {1} because account {2} is not linked to warehouse {3} or it is not the default inventory account" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:506 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:505 msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}" msgstr "" @@ -45641,7 +45762,7 @@ msgstr "" msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1192 +#: erpnext/controllers/stock_controller.py:1282 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" @@ -45653,7 +45774,7 @@ msgstr "" msgid "Row {0}: Hours value must be greater than zero." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:785 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:863 msgid "Row {0}: Invalid reference {1}" msgstr "" @@ -45677,7 +45798,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:583 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:593 msgid "Row {0}: Packed Qty must be equal to {1} Qty." msgstr "" @@ -45685,11 +45806,11 @@ msgstr "" msgid "Row {0}: Packing Slip is already created for Item {1}." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:811 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:889 msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:591 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:669 msgid "Row {0}: Party Type and Party is required for Receivable / Payable account {1}" msgstr "" @@ -45697,11 +45818,11 @@ msgstr "" msgid "Row {0}: Payment Term is mandatory" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:737 msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:652 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:730 msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry." msgstr "" @@ -45737,7 +45858,7 @@ msgstr "" msgid "Row {0}: Project must be same as the one set in the Timesheet: {1}." msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:114 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:118 msgid "Row {0}: Purchase Invoice {1} has no stock impact." msgstr "" @@ -45745,7 +45866,7 @@ msgstr "" msgid "Row {0}: Qty cannot be greater than {1} for the Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:391 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:392 msgid "Row {0}: Qty in Stock UOM can not be zero." msgstr "" @@ -45757,7 +45878,7 @@ msgstr "" msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:745 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:746 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "" @@ -45765,11 +45886,11 @@ msgstr "" msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1256 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1265 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1183 +#: erpnext/controllers/stock_controller.py:1273 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "" @@ -45777,7 +45898,7 @@ msgstr "" msgid "Row {0}: Task {1} does not belong to Project {2}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:434 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:435 msgid "Row {0}: The item {1}, quantity must be positive number" msgstr "" @@ -45789,7 +45910,7 @@ msgstr "" msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:385 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:386 msgid "Row {0}: UOM Conversion Factor is mandatory" msgstr "" @@ -45814,11 +45935,11 @@ msgstr "" msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:825 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:903 msgid "Row {0}: {1} {2} does not match with {3}" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:87 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:91 msgid "Row {0}: {2} Item {1} does not exist in {2} {3}" msgstr "" @@ -45826,7 +45947,7 @@ msgstr "" msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "" -#: erpnext/controllers/buying_controller.py:925 +#: erpnext/controllers/buying_controller.py:913 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "" @@ -45856,7 +45977,7 @@ msgstr "" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:91 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:124 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "" @@ -46125,7 +46246,7 @@ msgstr "" #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/delivery_note/delivery_note.js:294 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:343 #: erpnext/stock/doctype/delivery_note/delivery_note_list.js:65 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json msgid "Sales Invoice" @@ -46207,7 +46328,7 @@ msgstr "" msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:601 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:613 msgid "Sales Invoice {0} has already been submitted" msgstr "" @@ -46351,7 +46472,8 @@ msgstr "" #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.js:160 -#: erpnext/stock/doctype/material_request/material_request.js:202 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:223 +#: erpnext/stock/doctype/material_request/material_request.js:208 #: erpnext/stock/doctype/material_request_item/material_request_item.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json @@ -46435,7 +46557,7 @@ msgstr "" msgid "Sales Order Trends" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:253 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:266 msgid "Sales Order required for Item {0}" msgstr "" @@ -46502,7 +46624,7 @@ msgstr "" #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:122 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1160 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1161 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:99 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:194 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:74 @@ -46600,7 +46722,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:156 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:137 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:128 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1157 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1158 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:105 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:191 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:80 @@ -46687,7 +46809,7 @@ msgid "Sales Representative" msgstr "" #: erpnext/accounts/report/gross_profit/gross_profit.py:857 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:218 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:267 msgid "Sales Return" msgstr "" @@ -46906,7 +47028,7 @@ msgstr "" msgid "Sample Size" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3216 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3286 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "" @@ -46943,7 +47065,7 @@ msgid "Saturday" msgstr "" #: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js:118 -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:594 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -47322,7 +47444,7 @@ msgstr "" msgid "Segregate Serial / Batch Bundle" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:233 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:247 #: erpnext/selling/doctype/sales_order/sales_order.js:1095 #: erpnext/selling/doctype/sales_order/sales_order_list.js:96 #: erpnext/selling/report/sales_analytics/sales_analytics.js:93 @@ -47358,7 +47480,7 @@ msgid "Select BOM, Qty and For Warehouse" msgstr "" #: erpnext/public/js/utils/sales_common.js:417 -#: erpnext/stock/doctype/pick_list/pick_list.js:359 +#: erpnext/stock/doctype/pick_list/pick_list.js:353 msgid "Select Batch No" msgstr "" @@ -47378,11 +47500,11 @@ msgstr "" msgid "Select Columns and Filters" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:99 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:132 msgid "Select Company" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:429 +#: erpnext/manufacturing/doctype/job_card/job_card.js:427 msgid "Select Corrective Operation" msgstr "" @@ -47423,11 +47545,11 @@ msgstr "" msgid "Select DocType" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:146 +#: erpnext/manufacturing/doctype/job_card/job_card.js:145 msgid "Select Employees" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:223 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:237 msgid "Select Finished Good" msgstr "" @@ -47470,18 +47592,18 @@ msgstr "" msgid "Select Possible Supplier" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:939 -#: erpnext/stock/doctype/pick_list/pick_list.js:199 +#: erpnext/manufacturing/doctype/work_order/work_order.js:932 +#: erpnext/stock/doctype/pick_list/pick_list.js:193 msgid "Select Quantity" msgstr "" #: erpnext/public/js/utils/sales_common.js:417 -#: erpnext/stock/doctype/pick_list/pick_list.js:359 +#: erpnext/stock/doctype/pick_list/pick_list.js:353 msgid "Select Serial No" msgstr "" #: erpnext/public/js/utils/sales_common.js:420 -#: erpnext/stock/doctype/pick_list/pick_list.js:362 +#: erpnext/stock/doctype/pick_list/pick_list.js:356 msgid "Select Serial and Batch" msgstr "" @@ -47543,7 +47665,7 @@ msgstr "" msgid "Select a Supplier" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:380 +#: erpnext/stock/doctype/material_request/material_request.js:386 msgid "Select a Supplier from the Default Suppliers of the items below. On selection, a Purchase Order will be made against items belonging to the selected Supplier only." msgstr "" @@ -47602,7 +47724,7 @@ msgstr "" msgid "Select the Default Workstation where the Operation will be performed. This will be fetched in BOMs and Work Orders." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1024 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1017 msgid "Select the Item to be manufactured." msgstr "" @@ -47861,7 +47983,7 @@ msgstr "" #. Label of the sequence_id (Int) field in DocType 'Job Card' #: erpnext/manufacturing/doctype/job_card/job_card.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:319 +#: erpnext/manufacturing/doctype/work_order/work_order.js:330 msgid "Sequence Id" msgstr "" @@ -48002,7 +48124,7 @@ msgstr "" msgid "Serial No Range" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1895 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1941 msgid "Serial No Reserved" msgstr "" @@ -48042,7 +48164,7 @@ msgstr "" msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled." msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:860 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:909 msgid "Serial No is mandatory" msgstr "" @@ -48071,7 +48193,7 @@ msgstr "" msgid "Serial No {0} does not exist" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2624 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2671 msgid "Serial No {0} does not exists" msgstr "" @@ -48079,7 +48201,7 @@ msgstr "" msgid "Serial No {0} is already added" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:358 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:374 msgid "Serial No {0} is not present in the {1} {2}, hence you can't return it against the {1} {2}" msgstr "" @@ -48116,11 +48238,11 @@ msgstr "" msgid "Serial Nos and Batches" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1371 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1418 msgid "Serial Nos are created successfully" msgstr "" -#: erpnext/stock/stock_ledger.py:2151 +#: erpnext/stock/stock_ledger.py:2154 msgid "Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding." msgstr "" @@ -48194,15 +48316,15 @@ msgstr "" msgid "Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1599 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1639 msgid "Serial and Batch Bundle created" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1665 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1705 msgid "Serial and Batch Bundle updated" msgstr "" -#: erpnext/controllers/stock_controller.py:144 +#: erpnext/controllers/stock_controller.py:145 msgid "Serial and Batch Bundle {0} is already used in {1} {2}." msgstr "" @@ -48254,12 +48376,12 @@ msgstr "" msgid "Serial number {0} entered more than once" msgstr "" -#: erpnext/selling/page/point_of_sale/pos_item_details.js:440 +#: erpnext/selling/page/point_of_sale/pos_item_details.js:449 msgid "Serial numbers unavailable for Item {0} under warehouse {1}. Please try changing warehouse." msgstr "" #. Label of the naming_series (Select) field in DocType 'Bank Transaction' -#. Label of the naming_series (Data) field in DocType 'Budget' +#. Label of the naming_series (Select) field in DocType 'Budget' #. Label of the naming_series (Select) field in DocType 'Cashier Closing' #. Label of the naming_series (Select) field in DocType 'Dunning' #. Label of the naming_series (Select) field in DocType 'Journal Entry' @@ -48314,7 +48436,7 @@ msgstr "" #: erpnext/accounts/doctype/budget/budget.json #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/dunning/dunning.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:586 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:619 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json #: erpnext/accounts/doctype/payment_entry/payment_entry.json @@ -48596,8 +48718,8 @@ msgstr "" msgid "Set Default Supplier" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:300 -#: erpnext/manufacturing/doctype/job_card/job_card.js:369 +#: erpnext/manufacturing/doctype/job_card/job_card.js:298 +#: erpnext/manufacturing/doctype/job_card/job_card.js:367 msgid "Set Finished Good Quantity" msgstr "" @@ -48798,7 +48920,7 @@ msgstr "" msgid "Set targets Item Group-wise for this Sales Person." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1081 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1074 msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)" msgstr "" @@ -48812,15 +48934,15 @@ msgstr "" msgid "Set this if the customer is a Public Administration company." msgstr "" -#: erpnext/assets/doctype/asset/asset.py:753 +#: erpnext/assets/doctype/asset/asset.py:750 msgid "Set {0} in asset category {1} for company {2}" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:1087 +#: erpnext/assets/doctype/asset/asset.py:1083 msgid "Set {0} in asset category {1} or company {2}" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:1084 +#: erpnext/assets/doctype/asset/asset.py:1080 msgid "Set {0} in company {1}" msgstr "" @@ -49020,7 +49142,7 @@ msgid "Shift Name" msgstr "" #. Name of a DocType -#: erpnext/stock/doctype/delivery_note/delivery_note.js:194 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:243 #: erpnext/stock/doctype/shipment/shipment.json msgid "Shipment" msgstr "" @@ -49071,7 +49193,7 @@ msgstr "" msgid "Shipment details" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:772 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:784 msgid "Shipments" msgstr "" @@ -49574,7 +49696,7 @@ msgstr "" msgid "Simultaneous" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:508 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:509 msgid "Since there is a process loss of {0} units for the finished good {1}, you should reduce the quantity by {0} units for the finished good {1} in the Items Table." msgstr "" @@ -49610,7 +49732,7 @@ msgstr "" #. Label of the skip_material_transfer (Check) field in DocType 'Work Order #. Operation' -#: erpnext/manufacturing/doctype/work_order/work_order.js:325 +#: erpnext/manufacturing/doctype/work_order/work_order.js:336 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/doctype/workstation/workstation.js:454 msgid "Skip Material Transfer" @@ -49808,7 +49930,7 @@ msgstr "" msgid "Source Warehouse Address Link" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1067 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1133 msgid "Source Warehouse is mandatory for the Item {0}." msgstr "" @@ -49816,7 +49938,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:619 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:620 msgid "Source and target warehouse cannot be same for row {0}" msgstr "" @@ -49829,8 +49951,8 @@ msgstr "" msgid "Source of Funds (Liabilities)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:596 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:613 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:597 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:614 msgid "Source warehouse is mandatory for row {0}" msgstr "" @@ -49904,7 +50026,7 @@ msgstr "" msgid "Split Qty" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:1226 +#: erpnext/assets/doctype/asset/asset.py:1222 msgid "Split Quantity must be less than Asset Quantity" msgstr "" @@ -49972,7 +50094,7 @@ msgstr "" msgid "Stale Days" msgstr "" -#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:109 +#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:110 msgid "Stale Days should start from 1." msgstr "" @@ -50035,7 +50157,7 @@ msgstr "" msgid "Standing Name" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:729 +#: erpnext/manufacturing/doctype/work_order/work_order.js:722 #: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:57 #: erpnext/public/js/projects/timer.js:35 msgid "Start" @@ -50097,7 +50219,7 @@ msgstr "" msgid "Start Import" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:140 +#: erpnext/manufacturing/doctype/job_card/job_card.js:139 #: erpnext/manufacturing/doctype/workstation/workstation.js:124 msgid "Start Job" msgstr "" @@ -50281,6 +50403,7 @@ msgstr "" #. Label of the status_section (Section Break) field in DocType 'Material #. Request' #. Label of the status (Select) field in DocType 'Pick List' +#. Label of the status_section (Section Break) field in DocType 'Pick List' #. Label of the status (Select) field in DocType 'Purchase Receipt' #. Label of the status_section (Section Break) field in DocType 'Purchase #. Receipt' @@ -50320,12 +50443,12 @@ msgstr "" #: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16 #: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425 #: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json -#: erpnext/buying/doctype/purchase_order/purchase_order.js:364 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:370 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:376 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:385 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:388 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:395 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:378 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:384 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:390 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:399 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:402 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:409 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json @@ -50355,11 +50478,11 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan/production_plan.js:125 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:573 #: erpnext/manufacturing/doctype/production_plan/production_plan.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:457 -#: erpnext/manufacturing/doctype/work_order/work_order.js:493 -#: erpnext/manufacturing/doctype/work_order/work_order.js:690 -#: erpnext/manufacturing/doctype/work_order/work_order.js:701 -#: erpnext/manufacturing/doctype/work_order/work_order.js:709 +#: erpnext/manufacturing/doctype/work_order/work_order.js:468 +#: erpnext/manufacturing/doctype/work_order/work_order.js:504 +#: erpnext/manufacturing/doctype/work_order/work_order.js:683 +#: erpnext/manufacturing/doctype/work_order/work_order.js:694 +#: erpnext/manufacturing/doctype/work_order/work_order.js:702 #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/doctype/workstation/workstation.json @@ -50405,8 +50528,8 @@ msgstr "" #: erpnext/setup/doctype/driver/driver.json #: erpnext/setup/doctype/employee/employee.json #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json -#: erpnext/stock/doctype/delivery_note/delivery_note.js:274 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:309 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:323 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:358 #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_trip/delivery_trip.json #: erpnext/stock/doctype/material_request/material_request.json @@ -50491,8 +50614,8 @@ msgstr "" #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:50 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:73 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1330 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1364 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1329 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1363 #: erpnext/accounts/report/account_balance/account_balance.js:58 msgid "Stock Adjustment" msgstr "" @@ -50520,6 +50643,11 @@ msgstr "" msgid "Stock Analytics" msgstr "" +#. Label of the stock_asset_account (Link) field in DocType 'Journal Entry' +#: erpnext/accounts/doctype/journal_entry/journal_entry.json +msgid "Stock Asset Account" +msgstr "" + #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:19 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:30 msgid "Stock Assets" @@ -50589,12 +50717,16 @@ msgstr "" msgid "Stock Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:713 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:714 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "" #. Label of the stock_entry (Link) field in DocType 'Journal Entry' #. Label of a Link in the Manufacturing Workspace +#. Option for the 'Receipt Document Type' (Select) field in DocType 'Landed +#. Cost Item' +#. Option for the 'Receipt Document Type' (Select) field in DocType 'Landed +#. Cost Purchase Receipt' #. Option for the 'Reference Type' (Select) field in DocType 'Quality #. Inspection' #. Name of a DocType @@ -50604,7 +50736,8 @@ msgstr "" #. Label of a shortcut in the Stock Workspace #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json -#: erpnext/stock/doctype/pick_list/pick_list.js:123 +#: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json +#: erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json #: erpnext/stock/doctype/quality_inspection/quality_inspection.json #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json @@ -50627,6 +50760,11 @@ msgstr "" msgid "Stock Entry Detail" msgstr "" +#. Label of the stock_entry_item (Data) field in DocType 'Landed Cost Item' +#: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json +msgid "Stock Entry Item" +msgstr "" + #. Label of the stock_entry_type (Link) field in DocType 'Stock Entry' #. Name of a DocType #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -50634,7 +50772,7 @@ msgstr "" msgid "Stock Entry Type" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:1322 +#: erpnext/stock/doctype/pick_list/pick_list.py:1390 msgid "Stock Entry has been already created against this Pick List" msgstr "" @@ -50642,11 +50780,11 @@ msgstr "" msgid "Stock Entry {0} created" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1313 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1323 msgid "Stock Entry {0} has created" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1282 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1360 msgid "Stock Entry {0} is not submitted" msgstr "" @@ -50685,7 +50823,7 @@ msgstr "" msgid "Stock Ledger" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js:34 msgid "Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts" msgstr "" @@ -50854,28 +50992,28 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan/production_plan.js:276 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:284 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:290 -#: erpnext/manufacturing/doctype/work_order/work_order.js:817 +#: erpnext/manufacturing/doctype/work_order/work_order.js:810 +#: erpnext/manufacturing/doctype/work_order/work_order.js:819 #: erpnext/manufacturing/doctype/work_order/work_order.js:826 -#: erpnext/manufacturing/doctype/work_order/work_order.js:833 #: erpnext/manufacturing/doctype/work_order/work_order_dashboard.py:14 #: erpnext/public/js/stock_reservation.js:12 #: erpnext/selling/doctype/sales_order/sales_order.js:78 #: erpnext/selling/doctype/sales_order/sales_order.js:92 #: erpnext/selling/doctype/sales_order/sales_order.js:101 #: erpnext/selling/doctype/sales_order/sales_order.js:221 -#: erpnext/stock/doctype/pick_list/pick_list.js:135 -#: erpnext/stock/doctype/pick_list/pick_list.js:150 -#: erpnext/stock/doctype/pick_list/pick_list.js:155 +#: erpnext/stock/doctype/pick_list/pick_list.js:129 +#: erpnext/stock/doctype/pick_list/pick_list.js:144 +#: erpnext/stock/doctype/pick_list/pick_list.js:149 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:25 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:703 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:573 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1136 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1396 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1409 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1423 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1437 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1451 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:637 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1206 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1468 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1481 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1495 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1509 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1523 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1540 #: erpnext/stock/doctype/stock_settings/stock_settings.json #: erpnext/stock/doctype/stock_settings/stock_settings.py:172 #: erpnext/stock/doctype/stock_settings/stock_settings.py:184 @@ -50884,13 +51022,13 @@ msgstr "" msgid "Stock Reservation" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1577 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649 msgid "Stock Reservation Entries Cancelled" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2131 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2133 #: erpnext/manufacturing/doctype/work_order/work_order.py:1688 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1529 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601 msgid "Stock Reservation Entries Created" msgstr "" @@ -50898,25 +51036,25 @@ msgstr "" #: erpnext/public/js/stock_reservation.js:308 #: erpnext/selling/doctype/sales_order/sales_order.js:438 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:260 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:323 #: erpnext/stock/report/reserved_stock/reserved_stock.js:53 #: erpnext/stock/report/reserved_stock/reserved_stock.py:171 msgid "Stock Reservation Entry" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:436 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:499 msgid "Stock Reservation Entry cannot be updated as it has been delivered." msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:430 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:493 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:536 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:546 msgid "Stock Reservation Warehouse Mismatch" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:582 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:646 msgid "Stock Reservation can only be created against {0}." msgstr "" @@ -50951,7 +51089,7 @@ msgstr "" #. Label of a Link in the Stock Workspace #: erpnext/setup/doctype/company/company.json #: erpnext/setup/workspace/settings/settings.json -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:574 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:638 #: erpnext/stock/doctype/stock_settings/stock_settings.json #: erpnext/stock/workspace/stock/stock.json msgid "Stock Settings" @@ -51153,15 +51291,15 @@ msgstr "" msgid "Stock and Manufacturing" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:127 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:191 msgid "Stock cannot be reserved in group warehouse {0}." msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1341 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1413 msgid "Stock cannot be reserved in the group warehouse {0}." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:726 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:725 msgid "Stock cannot be updated against Purchase Receipt {0}" msgstr "" @@ -51173,11 +51311,11 @@ msgstr "" msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item." msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1034 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1100 msgid "Stock has been unreserved for work order {0}." msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:231 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:294 msgid "Stock not available for Item {0} in Warehouse {1}." msgstr "" @@ -51239,9 +51377,9 @@ msgstr "" #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json #: erpnext/accounts/doctype/budget/budget.json #: erpnext/buying/doctype/buying_settings/buying_settings.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:697 +#: erpnext/manufacturing/doctype/work_order/work_order.js:690 #: erpnext/selling/doctype/selling_settings/selling_settings.json -#: erpnext/stock/doctype/material_request/material_request.js:117 +#: erpnext/stock/doctype/material_request/material_request.js:123 #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Stop" msgstr "" @@ -51400,7 +51538,7 @@ msgstr "" msgid "Subcontracted Item To Be Received" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:190 +#: erpnext/stock/doctype/material_request/material_request.js:196 msgid "Subcontracted Purchase Order" msgstr "" @@ -51454,7 +51592,7 @@ msgstr "" #. Receipt Item' #. Label of the subcontracting_order (Link) field in DocType 'Subcontracting #. Receipt Supplied Item' -#: erpnext/buying/doctype/purchase_order/purchase_order.js:423 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:437 #: erpnext/controllers/subcontracting_controller.py:954 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -51499,12 +51637,18 @@ msgid "Subcontracting Purchase Order" msgstr "" #. Label of a Link in the Manufacturing Workspace +#. Option for the 'Receipt Document Type' (Select) field in DocType 'Landed +#. Cost Item' +#. Option for the 'Receipt Document Type' (Select) field in DocType 'Landed +#. Cost Purchase Receipt' #. Label of the subcontracting_receipt (Link) field in DocType 'Purchase #. Receipt' #. Option for the 'Reference Type' (Select) field in DocType 'Quality #. Inspection' #. Name of a DocType #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json +#: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json +#: erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/quality_inspection/quality_inspection.json #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:258 @@ -51571,7 +51715,7 @@ msgid "Submit" msgstr "" #: erpnext/buying/doctype/purchase_order/purchase_order.py:929 -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:855 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:910 msgid "Submit Action Failed" msgstr "" @@ -51597,7 +51741,7 @@ msgstr "" msgid "Submit Journal Entries" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:167 +#: erpnext/manufacturing/doctype/work_order/work_order.js:178 msgid "Submit this Work Order for further processing." msgstr "" @@ -52107,7 +52251,7 @@ msgstr "" #: erpnext/accounts/doctype/tax_rule/tax_rule.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:111 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:87 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1164 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1165 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:198 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:238 #: erpnext/accounts/report/purchase_register/purchase_register.js:27 @@ -52152,7 +52296,7 @@ msgstr "" msgid "Supplier Invoice Date" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1729 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1728 msgid "Supplier Invoice Date cannot be greater than Posting Date" msgstr "" @@ -52162,12 +52306,12 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:59 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:104 -#: erpnext/accounts/report/general_ledger/general_ledger.py:735 +#: erpnext/accounts/report/general_ledger/general_ledger.py:736 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:212 msgid "Supplier Invoice No" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1756 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1755 msgid "Supplier Invoice No exists in Purchase Invoice {0}" msgstr "" @@ -52207,7 +52351,7 @@ msgstr "" #. Label of the supplier_name (Data) field in DocType 'Purchase Receipt' #. Label of the supplier_name (Data) field in DocType 'Stock Entry' #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1081 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1082 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:156 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:198 #: erpnext/accounts/report/purchase_register/purchase_register.py:177 @@ -52287,7 +52431,7 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Buying Workspace #. Label of the supplier_quotation (Link) field in DocType 'Quotation' -#: erpnext/buying/doctype/purchase_order/purchase_order.js:599 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:613 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:49 @@ -52298,7 +52442,7 @@ msgstr "" #: erpnext/buying/workspace/buying/buying.json #: erpnext/crm/doctype/opportunity/opportunity.js:81 #: erpnext/selling/doctype/quotation/quotation.json -#: erpnext/stock/doctype/material_request/material_request.js:174 +#: erpnext/stock/doctype/material_request/material_request.js:180 msgid "Supplier Quotation" msgstr "" @@ -52554,6 +52698,7 @@ msgstr "" #: erpnext/accounts/doctype/party_link/party_link.json #: erpnext/accounts/doctype/payment_term/payment_term.json #: erpnext/accounts/doctype/payment_terms_template/payment_terms_template.json +#: erpnext/accounts/doctype/pegged_currencies/pegged_currencies.json #: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json #: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.json #: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json @@ -52719,7 +52864,7 @@ msgstr "" msgid "TDS Computation Summary" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1513 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1512 msgid "TDS Deducted" msgstr "" @@ -52768,29 +52913,23 @@ msgstr "" msgid "Target Asset" msgstr "" -#. Label of the target_asset_location (Link) field in DocType 'Asset -#. Capitalization' -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json -msgid "Target Asset Location" -msgstr "" - -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:229 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:227 msgid "Target Asset {0} cannot be cancelled" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:227 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:225 msgid "Target Asset {0} cannot be submitted" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:223 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:221 msgid "Target Asset {0} cannot be {1}" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:233 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:231 msgid "Target Asset {0} does not belong to company {1}" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:212 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:210 msgid "Target Asset {0} needs to be composite asset" msgstr "" @@ -52859,12 +52998,7 @@ msgstr "" msgid "Target Item Code" msgstr "" -#. Label of the target_item_name (Data) field in DocType 'Asset Capitalization' -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json -msgid "Target Item Name" -msgstr "" - -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:194 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:192 msgid "Target Item {0} must be a Fixed Asset item" msgstr "" @@ -52894,7 +53028,7 @@ msgstr "" msgid "Target Qty" msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:199 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:197 msgid "Target Qty must be a positive number" msgstr "" @@ -52917,7 +53051,7 @@ msgstr "" #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:913 +#: erpnext/manufacturing/doctype/work_order/work_order.js:906 #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/stock/dashboard/item_dashboard.js:231 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -52950,8 +53084,8 @@ msgstr "" msgid "Target Warehouse is set for some items but the customer is not an internal customer." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:602 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:609 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:603 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:610 msgid "Target warehouse is mandatory for row {0}" msgstr "" @@ -53236,7 +53370,7 @@ msgstr "" #. Label of the rate (Float) field in DocType 'Purchase Taxes and Charges' #. Label of the rate (Float) field in DocType 'Sales Taxes and Charges' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/account_tree.js:161 +#: erpnext/accounts/doctype/account/account_tree.js:166 #: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json #: erpnext/accounts/doctype/item_tax_template_detail/item_tax_template_detail.json #: erpnext/accounts/doctype/pos_closing_entry/closing_voucher_details.html:66 @@ -53591,7 +53725,7 @@ msgstr "" msgid "Template Item" msgstr "" -#: erpnext/stock/get_item_details.py:319 +#: erpnext/stock/get_item_details.py:322 msgid "Template Item Selected" msgstr "" @@ -53817,7 +53951,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/accounts/doctype/territory_item/territory_item.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:134 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1148 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1149 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:93 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:182 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:68 @@ -53921,7 +54055,7 @@ msgstr "" msgid "The BOM which will be replaced" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1306 +#: erpnext/stock/serial_batch_bundle.py:1349 msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity." msgstr "" @@ -53957,11 +54091,11 @@ msgstr "" msgid "The Payment Term at row {0} is possibly a duplicate." msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:270 +#: erpnext/stock/doctype/pick_list/pick_list.py:286 msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2104 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2174 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -53969,15 +54103,15 @@ msgstr "" msgid "The Sales Person is linked with {0}" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:149 +#: erpnext/stock/doctype/pick_list/pick_list.py:152 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:1892 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1938 msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1424 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1437 msgid "The Serial and Batch Bundle {0} is not valid for this transaction. The 'Type of Transaction' should be 'Outward' instead of 'Inward' in Serial and Batch Bundle {0}" msgstr "" @@ -53985,7 +54119,7 @@ msgstr "" msgid "The Stock Entry of type 'Manufacture' is known as backflush. Raw materials being consumed to manufacture finished goods is known as backflushing.

When creating Manufacture Entry, raw-material items are backflushed based on BOM of production item. If you want raw-material items to be backflushed based on Material Transfer entry made against that Work Order instead, then you can set it under this field." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1833 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1903 msgid "The Work Order is mandatory for Disassembly Order" msgstr "" @@ -54007,7 +54141,7 @@ msgstr "" msgid "The currency of invoice {} ({}) is different from the currency of this dunning ({})." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1029 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1022 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM." msgstr "" @@ -54032,7 +54166,7 @@ msgstr "" msgid "The field To Shareholder cannot be blank" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:387 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:397 msgid "The field {0} in row {1} is not set" msgstr "" @@ -54052,7 +54186,7 @@ msgstr "" msgid "The following assets have failed to automatically post depreciation entries: {0}" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:234 +#: erpnext/stock/doctype/pick_list/pick_list.py:250 msgid "The following batches are expired, please restock them:
{0}" msgstr "" @@ -54081,7 +54215,7 @@ msgstr "" msgid "The holiday on {0} is not between From Date and To Date" msgstr "" -#: erpnext/controllers/buying_controller.py:1128 +#: erpnext/controllers/buying_controller.py:1116 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" @@ -54089,7 +54223,7 @@ msgstr "" msgid "The items {0} and {1} are present in the following {2} :" msgstr "" -#: erpnext/controllers/buying_controller.py:1121 +#: erpnext/controllers/buying_controller.py:1109 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "" @@ -54167,7 +54301,7 @@ msgstr "" msgid "The reserved stock will be released when you update items. Are you certain you wish to proceed?" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.js:144 +#: erpnext/stock/doctype/pick_list/pick_list.js:138 msgid "The reserved stock will be released. Are you certain you wish to proceed?" msgstr "" @@ -54230,8 +54364,8 @@ msgstr "" msgid "The system will create a Sales Invoice or a POS Invoice from the POS interface based on this setting. For high-volume transactions, it is recommended to use POS Invoice." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:174 -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:181 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:178 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:185 msgid "The task has been enqueued as a background job." msgstr "" @@ -54273,19 +54407,19 @@ msgstr "" msgid "The value {0} is already assigned to an existing Item {1}." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1057 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1050 msgid "The warehouse where you store finished Items before they are shipped." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1050 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1043 msgid "The warehouse where you store your raw materials. Each required item can have a separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of the Work Order, the raw materials will be reserved in these warehouses for production usage." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1062 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1055 msgid "The warehouse where your Items will be transferred when you begin production. Group Warehouse can also be selected as a Work in Progress warehouse." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:760 +#: erpnext/manufacturing/doctype/job_card/job_card.py:768 msgid "The {0} ({1}) must be equal to {2} ({3})" msgstr "" @@ -54297,11 +54431,11 @@ msgstr "" msgid "The {0} {1} created successfully" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:866 +#: erpnext/manufacturing/doctype/job_card/job_card.py:874 msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}." msgstr "" -#: erpnext/assets/doctype/asset/asset.py:582 +#: 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 "" @@ -54337,7 +54471,7 @@ msgstr "" msgid "There can be multiple tiered collection factor based on the total spent. But the conversion factor for redemption will always be same for all the tier." msgstr "" -#: erpnext/accounts/party.py:586 +#: erpnext/accounts/party.py:588 msgid "There can only be 1 Account per Company in {0} {1}" msgstr "" @@ -54357,7 +54491,7 @@ msgstr "" msgid "There is no batch found against the {0}: {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1365 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1374 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -54428,7 +54562,7 @@ msgstr "" msgid "This action will unlink this account from any external service integrating ERPNext with your bank accounts. It cannot be undone. Are you certain ?" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:362 +#: erpnext/assets/doctype/asset/asset.py:359 msgid "This asset category is marked as non-depreciable. Please disable depreciation calculation or choose a different category." msgstr "" @@ -54436,11 +54570,11 @@ msgstr "" msgid "This covers all scorecards tied to this Setup" msgstr "" -#: erpnext/controllers/status_updater.py:384 +#: erpnext/controllers/status_updater.py:395 msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.js:434 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:483 msgid "This field is used to set the 'Customer'." msgstr "" @@ -54523,11 +54657,11 @@ msgstr "" msgid "This is considered dangerous from accounting point of view." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:530 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:529 msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1043 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1036 msgid "This is enabled by default. If you want to plan materials for sub-assemblies of the Item you're manufacturing leave this enabled. If you plan and manufacture the sub-assemblies separately, you can disable this checkbox." msgstr "" @@ -54539,15 +54673,15 @@ msgstr "" msgid "This item filter has already been applied for the {0}" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.js:447 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:496 msgid "This option can be checked to edit the 'Posting Date' and 'Posting Time' fields." msgstr "" -#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py:191 +#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py:192 msgid "This schedule was created when Asset {0} was adjusted through Asset Value Adjustment {1}." msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:497 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:491 msgid "This schedule was created when Asset {0} was consumed through Asset Capitalization {1}." msgstr "" @@ -54559,7 +54693,7 @@ msgstr "" msgid "This schedule was created when Asset {0} was restored due to Sales Invoice {1} cancellation." msgstr "" -#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:632 +#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:595 msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation." msgstr "" @@ -54575,7 +54709,7 @@ msgstr "" msgid "This schedule was created when Asset {0} was scrapped." msgstr "" -#: erpnext/assets/doctype/asset/asset.py:1360 +#: erpnext/assets/doctype/asset/asset.py:1356 msgid "This schedule was created when Asset {0} was {1} into new Asset {2}." msgstr "" @@ -54583,7 +54717,7 @@ msgstr "" msgid "This schedule was created when Asset {0} was {1} through Sales Invoice {2}." msgstr "" -#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py:198 +#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py:199 msgid "This schedule was created when Asset {0}'s Asset Value Adjustment {1} was cancelled." msgstr "" @@ -54597,7 +54731,7 @@ msgstr "" msgid "This section allows the user to set the Body and Closing text of the Dunning Letter for the Dunning Type based on language, which can be used in Print." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.js:440 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:489 msgid "This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc." msgstr "" @@ -54768,7 +54902,7 @@ msgstr "" msgid "Time in mins." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:739 +#: erpnext/manufacturing/doctype/job_card/job_card.py:747 msgid "Time logs are required for {0} {1}" msgstr "" @@ -55290,11 +55424,11 @@ msgstr "" msgid "To add subcontracted Item's raw materials if include exploded items is disabled." msgstr "" -#: erpnext/controllers/status_updater.py:379 +#: erpnext/controllers/status_updater.py:390 msgid "To allow over billing, update \"Over Billing Allowance\" in Accounts Settings or the Item." msgstr "" -#: erpnext/controllers/status_updater.py:375 +#: erpnext/controllers/status_updater.py:386 msgid "To allow over receipt / delivery, update \"Over Receipt/Delivery Allowance\" in Stock Settings or the Item." msgstr "" @@ -55353,11 +55487,11 @@ msgstr "" msgid "To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:620 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:619 msgid "To submit the invoice without purchase order please set {0} as {1} in {2}" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:641 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:640 msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}" msgstr "" @@ -55367,7 +55501,7 @@ msgid "To use a different finance book, please uncheck 'Include Default FB Asset msgstr "" #: erpnext/accounts/report/financial_statements.py:596 -#: erpnext/accounts/report/general_ledger/general_ledger.py:304 +#: erpnext/accounts/report/general_ledger/general_ledger.py:305 #: erpnext/accounts/report/trial_balance/trial_balance.py:292 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "" @@ -55409,8 +55543,8 @@ msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of the tools (Column Break) field in DocType 'Email Digest' #. Label of a Card Break in the Stock Workspace -#: erpnext/buying/doctype/purchase_order/purchase_order.js:630 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:706 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:644 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:720 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:70 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:157 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:442 @@ -55461,7 +55595,7 @@ msgstr "" #: erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:229 #: erpnext/accounts/report/financial_statements.py:673 #: erpnext/accounts/report/general_ledger/general_ledger.html:132 -#: erpnext/accounts/report/general_ledger/general_ledger.py:378 +#: erpnext/accounts/report/general_ledger/general_ledger.py:379 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:694 #: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:93 #: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:98 @@ -55604,7 +55738,7 @@ msgstr "" msgid "Total Amount in Words" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:210 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:207 msgid "Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges" msgstr "" @@ -55689,7 +55823,7 @@ msgstr "" #. Label of the total_completed_qty (Float) field in DocType 'Job Card' #: erpnext/manufacturing/doctype/job_card/job_card.json -#: erpnext/manufacturing/doctype/job_card/job_card.py:756 +#: erpnext/manufacturing/doctype/job_card/job_card.py:764 #: erpnext/manufacturing/report/job_card_summary/job_card_summary.py:174 msgid "Total Completed Qty" msgstr "" @@ -55737,7 +55871,7 @@ msgstr "" msgid "Total Credit" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:269 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:343 msgid "Total Credit/ Debit Amount should be same as linked Journal Entry" msgstr "" @@ -55746,7 +55880,7 @@ msgstr "" msgid "Total Debit" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:925 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1003 msgid "Total Debit must be equal to Total Credit. The difference is {0}" msgstr "" @@ -56281,7 +56415,7 @@ msgstr "" msgid "Total {0} ({1})" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:191 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:188 msgid "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'" msgstr "" @@ -56484,7 +56618,7 @@ msgstr "" msgid "Transaction currency: {0} cannot be different from Bank Account({1}) currency: {2}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:732 +#: erpnext/manufacturing/doctype/job_card/job_card.py:740 msgid "Transaction not allowed against stopped Work Order {0}" msgstr "" @@ -56523,7 +56657,7 @@ msgstr "" #. Option for the 'Asset Status' (Select) field in DocType 'Serial No' #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/assets/doctype/asset_movement/asset_movement.json -#: erpnext/buying/doctype/purchase_order/purchase_order.js:417 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:431 #: erpnext/stock/doctype/item_reorder/item_reorder.json #: erpnext/stock/doctype/serial_no/serial_no.json #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:266 @@ -56995,7 +57129,7 @@ msgstr "" msgid "UOM Conversion Factor" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1382 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1383 msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}" msgstr "" @@ -57008,7 +57142,7 @@ msgstr "" msgid "UOM Name" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3138 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3208 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -57062,7 +57196,7 @@ msgstr "" msgid "UnReconcile Allocations" msgstr "" -#: erpnext/setup/utils.py:137 +#: erpnext/setup/utils.py:182 msgid "Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually" msgstr "" @@ -57283,9 +57417,9 @@ msgstr "" msgid "Unreconciled Entries" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:824 +#: erpnext/manufacturing/doctype/work_order/work_order.js:817 #: erpnext/selling/doctype/sales_order/sales_order.js:90 -#: erpnext/stock/doctype/pick_list/pick_list.js:141 +#: erpnext/stock/doctype/pick_list/pick_list.js:135 msgid "Unreserve" msgstr "" @@ -57304,7 +57438,7 @@ msgstr "" #: erpnext/public/js/stock_reservation.js:280 #: erpnext/selling/doctype/sales_order/sales_order.js:485 -#: erpnext/stock/doctype/pick_list/pick_list.js:293 +#: erpnext/stock/doctype/pick_list/pick_list.js:287 msgid "Unreserving Stock..." msgstr "" @@ -57375,8 +57509,8 @@ msgstr "" #: erpnext/accounts/doctype/account/account.js:204 #: erpnext/accounts/doctype/cost_center/cost_center.js:107 -#: erpnext/manufacturing/doctype/job_card/job_card.js:299 -#: erpnext/manufacturing/doctype/job_card/job_card.js:368 +#: erpnext/manufacturing/doctype/job_card/job_card.js:297 +#: erpnext/manufacturing/doctype/job_card/job_card.js:366 #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:500 #: erpnext/public/js/utils.js:598 erpnext/public/js/utils.js:902 #: erpnext/public/js/utils/barcode_scanner.js:183 @@ -57491,7 +57625,7 @@ msgstr "" msgid "Update Cost Center Name / Number" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.js:111 +#: erpnext/stock/doctype/pick_list/pick_list.js:105 msgid "Update Current Stock" msgstr "" @@ -57507,7 +57641,7 @@ msgstr "" msgid "Update Existing Records" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:348 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:362 #: erpnext/public/js/utils.js:854 #: erpnext/selling/doctype/sales_order/sales_order.js:59 msgid "Update Items" @@ -57538,7 +57672,7 @@ msgstr "" msgid "Update Rate and Availability" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:619 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:633 msgid "Update Rate as per Last Purchase" msgstr "" @@ -57574,7 +57708,7 @@ msgstr "" msgid "Update latest price in all BOMs" msgstr "" -#: erpnext/assets/doctype/asset/asset.py:404 +#: erpnext/assets/doctype/asset/asset.py:401 msgid "Update stock must be enabled for the purchase invoice {0}" msgstr "" @@ -57608,7 +57742,7 @@ msgstr "" msgid "Updating Variants..." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1005 +#: erpnext/manufacturing/doctype/work_order/work_order.js:998 msgid "Updating Work Order status" msgstr "" @@ -57810,7 +57944,7 @@ msgstr "" msgid "User Details" msgstr "" -#: erpnext/setup/install.py:152 +#: erpnext/setup/install.py:153 msgid "User Forum" msgstr "" @@ -57828,7 +57962,7 @@ msgstr "" #. Label of the user_remark (Small Text) field in DocType 'Journal Entry' #. Label of the user_remark (Small Text) field in DocType 'Journal Entry #. Account' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:582 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:615 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json msgid "User Remark" @@ -58495,13 +58629,13 @@ msgstr "" #: erpnext/accounts/doctype/account/account.js:73 #: erpnext/accounts/doctype/account/account.js:102 -#: erpnext/accounts/doctype/account/account_tree.js:186 -#: erpnext/accounts/doctype/account/account_tree.js:196 +#: erpnext/accounts/doctype/account/account_tree.js:191 #: erpnext/accounts/doctype/account/account_tree.js:201 -#: erpnext/accounts/doctype/account/account_tree.js:218 +#: erpnext/accounts/doctype/account/account_tree.js:206 +#: erpnext/accounts/doctype/account/account_tree.js:223 #: 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:43 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:76 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:670 #: erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:14 #: erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:24 @@ -58555,7 +58689,7 @@ msgstr "" msgid "View Leads" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:265 +#: erpnext/accounts/doctype/account/account_tree.js:270 #: erpnext/stock/doctype/batch/batch.js:18 msgid "View Ledger" msgstr "" @@ -58689,11 +58823,11 @@ msgstr "" #: erpnext/accounts/doctype/repost_accounting_ledger_items/repost_accounting_ledger_items.json #: erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1103 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1104 #: 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:704 #: 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 @@ -58720,7 +58854,7 @@ msgstr "" msgid "Voucher No" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1088 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1135 msgid "Voucher No is mandatory" msgstr "" @@ -58732,7 +58866,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:698 msgid "Voucher Subtype" msgstr "" @@ -58762,9 +58896,9 @@ msgstr "" #: erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json #: erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1101 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1102 #: 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:696 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:159 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -58968,7 +59102,7 @@ msgstr "" #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json #: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:258 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:321 #: erpnext/stock/doctype/warehouse/warehouse.json #: erpnext/stock/page/stock_balance/stock_balance.js:11 #: erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:25 @@ -59117,7 +59251,7 @@ msgid "Warehouse not found against the account {0}" msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1128 -#: erpnext/stock/doctype/delivery_note/delivery_note.py:414 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:424 msgid "Warehouse required for stock Item {0}" msgstr "" @@ -59147,7 +59281,7 @@ msgstr "" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:654 +#: erpnext/controllers/stock_controller.py:659 msgid "Warehouse {0} is not linked to any account, please mention the account in the warehouse record or set default inventory account in company {1}." msgstr "" @@ -59266,11 +59400,11 @@ msgstr "" msgid "Warning!" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1288 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1366 msgid "Warning: Another {0} # {1} exists against stock entry {2}" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:499 +#: erpnext/stock/doctype/material_request/material_request.js:505 msgid "Warning: Material Requested Qty is less than Minimum Order Qty" msgstr "" @@ -59592,7 +59726,7 @@ msgstr "" msgid "Welcome email sent" msgstr "" -#: erpnext/setup/utils.py:188 +#: erpnext/setup/utils.py:233 msgid "Welcome to {0}" msgstr "" @@ -59742,7 +59876,7 @@ msgstr "" #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:104 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/selling/doctype/sales_order/sales_order.js:659 -#: erpnext/stock/doctype/material_request/material_request.js:182 +#: erpnext/stock/doctype/material_request/material_request.js:188 #: erpnext/stock/doctype/material_request/material_request.json #: erpnext/stock/doctype/material_request/material_request.py:864 #: erpnext/stock/doctype/pick_list/pick_list.json @@ -59808,7 +59942,7 @@ msgid "Work Order cannot be raised against a Item Template" msgstr "" #: erpnext/manufacturing/doctype/work_order/work_order.py:2000 -#: erpnext/manufacturing/doctype/work_order/work_order.py:2078 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2080 msgid "Work Order has been {0}" msgstr "" @@ -59816,7 +59950,7 @@ msgstr "" msgid "Work Order not created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:663 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:664 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "" @@ -59903,7 +60037,7 @@ msgstr "" #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json #: erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json #: erpnext/manufacturing/doctype/job_card/job_card.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:289 +#: erpnext/manufacturing/doctype/work_order/work_order.js:300 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/doctype/workstation/workstation.json #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.js:35 @@ -60236,7 +60370,7 @@ msgstr "" msgid "You are not authorized to set Frozen value" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:451 +#: erpnext/stock/doctype/pick_list/pick_list.py:468 msgid "You are picking more than required quantity for the item {0}. Check if there is any other pick list created for the sales order {1}." msgstr "" @@ -60256,7 +60390,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:701 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:779 msgid "You can not enter current voucher in 'Against Journal Entry' column" msgstr "" @@ -60281,7 +60415,7 @@ msgstr "" msgid "You can set it as a machine name or operation type. For example, stiching machine 12" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1166 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1174 msgid "You can't make any changes to Job Card since Work Order is closed." msgstr "" @@ -60309,7 +60443,7 @@ msgstr "" msgid "You cannot create/amend any accounting entries till this date." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:934 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1012 msgid "You cannot credit and debit same account at the same time" msgstr "" @@ -60454,7 +60588,7 @@ msgstr "" msgid "Zero Rated" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:391 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:392 msgid "Zero quantity" msgstr "" @@ -60467,7 +60601,7 @@ msgstr "" msgid "[Important] [ERPNext] Auto Reorder Errors" msgstr "" -#: erpnext/controllers/status_updater.py:276 +#: erpnext/controllers/status_updater.py:287 msgid "`Allow Negative rates for Items`" msgstr "" @@ -60511,7 +60645,7 @@ msgstr "" msgid "cannot be greater than 100" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:330 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:329 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1044 msgid "dated {0}" msgstr "" @@ -60584,7 +60718,7 @@ msgstr "" msgid "image" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:276 +#: erpnext/accounts/doctype/budget/budget.py:273 msgid "is already" msgstr "" @@ -60765,8 +60899,8 @@ msgstr "" msgid "subscription is already cancelled." msgstr "" -#: erpnext/controllers/status_updater.py:387 -#: erpnext/controllers/status_updater.py:407 +#: erpnext/controllers/status_updater.py:398 +#: erpnext/controllers/status_updater.py:418 msgid "target_ref_field" msgstr "" @@ -60807,7 +60941,7 @@ msgstr "" msgid "via BOM Update Tool" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:279 +#: erpnext/accounts/doctype/budget/budget.py:276 msgid "will be" msgstr "" @@ -60832,7 +60966,7 @@ msgstr "" msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:294 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:319 msgid "{0} {1} has submitted Assets. Remove Item {2} from table to continue." msgstr "" @@ -60844,7 +60978,7 @@ msgstr "" msgid "{0} Account: {1} ({2}) must be in either customer billing currency: {3} or Company default currency: {4}" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:284 +#: erpnext/accounts/doctype/budget/budget.py:281 msgid "{0} Budget for Account {1} against {2} {3} is {4}. It {5} exceed by {6}" msgstr "" @@ -60860,7 +60994,7 @@ msgstr "" msgid "{0} Number {1} is already used in {2} {3}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:483 +#: erpnext/manufacturing/doctype/work_order/work_order.js:494 msgid "{0} Operations: {1}" msgstr "" @@ -60884,19 +61018,19 @@ msgstr "" msgid "{0} account not found while submitting purchase receipt" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1054 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1132 msgid "{0} against Bill {1} dated {2}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1063 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1141 msgid "{0} against Purchase Order {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1030 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1108 msgid "{0} against Sales Invoice {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1037 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1115 msgid "{0} against Sales Order {1}" msgstr "" @@ -60904,7 +61038,7 @@ msgstr "" msgid "{0} already has a Parent Procedure {1}." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:531 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:541 msgid "{0} and {1}" msgstr "" @@ -61036,7 +61170,7 @@ msgstr "" msgid "{0} is not a group node. Please select a group node as parent cost center" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:440 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:441 msgid "{0} is not a stock Item" msgstr "" @@ -61067,19 +61201,19 @@ msgstr "" #: erpnext/accounts/doctype/gl_entry/gl_entry.py:130 #: erpnext/accounts/doctype/pricing_rule/pricing_rule.py:172 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:192 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:120 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:184 msgid "{0} is required" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:438 +#: erpnext/manufacturing/doctype/work_order/work_order.js:449 msgid "{0} items in progress" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:449 +#: erpnext/manufacturing/doctype/work_order/work_order.js:460 msgid "{0} items lost during process." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:419 +#: erpnext/manufacturing/doctype/work_order/work_order.js:430 msgid "{0} items produced" msgstr "" @@ -61103,7 +61237,7 @@ msgstr "" msgid "{0} payment entries can not be filtered by {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1366 +#: erpnext/controllers/stock_controller.py:1456 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -61115,11 +61249,11 @@ msgstr "" msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:974 +#: erpnext/stock/doctype/pick_list/pick_list.py:1001 msgid "{0} units of Item {1} is not available in any of the warehouses." msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:966 +#: erpnext/stock/doctype/pick_list/pick_list.py:993 msgid "{0} units of Item {1} is picked in another Pick List." msgstr "" @@ -61127,12 +61261,12 @@ msgstr "" msgid "{0} units of {1} are required in {2} with the inventory dimension: {3} ({4}) on {5} {6} for {7} to complete the transaction." msgstr "" -#: erpnext/stock/stock_ledger.py:1547 erpnext/stock/stock_ledger.py:2037 -#: erpnext/stock/stock_ledger.py:2051 +#: erpnext/stock/stock_ledger.py:1547 erpnext/stock/stock_ledger.py:2040 +#: erpnext/stock/stock_ledger.py:2054 msgid "{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction." msgstr "" -#: erpnext/stock/stock_ledger.py:2138 erpnext/stock/stock_ledger.py:2184 +#: erpnext/stock/stock_ledger.py:2141 erpnext/stock/stock_ledger.py:2187 msgid "{0} units of {1} needed in {2} on {3} {4} to complete this transaction." msgstr "" @@ -61156,7 +61290,7 @@ msgstr "" msgid "{0} will be given as discount." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:875 +#: erpnext/manufacturing/doctype/job_card/job_card.py:883 msgid "{0} {1}" msgstr "" @@ -61168,7 +61302,7 @@ msgstr "" msgid "{0} {1} Partially Reconciled" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:424 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:487 msgid "{0} {1} cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one." msgstr "" @@ -61182,7 +61316,7 @@ msgstr "" msgid "{0} {1} does not exist" msgstr "" -#: erpnext/accounts/party.py:566 +#: erpnext/accounts/party.py:568 msgid "{0} {1} has accounting entries in currency {2} for company {3}. Please select a receivable or payable account with currency {2}." msgstr "" @@ -61229,23 +61363,23 @@ msgstr "" msgid "{0} {1} is cancelled so the action cannot be completed" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:849 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:927 msgid "{0} {1} is closed" msgstr "" -#: erpnext/accounts/party.py:804 +#: erpnext/accounts/party.py:806 msgid "{0} {1} is disabled" msgstr "" -#: erpnext/accounts/party.py:810 +#: erpnext/accounts/party.py:812 msgid "{0} {1} is frozen" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924 msgid "{0} {1} is fully billed" msgstr "" -#: erpnext/accounts/party.py:814 +#: erpnext/accounts/party.py:816 msgid "{0} {1} is not active" msgstr "" @@ -61257,8 +61391,8 @@ msgstr "" msgid "{0} {1} is not in any active Fiscal Year" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:843 -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:882 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:921 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:960 msgid "{0} {1} is not submitted" msgstr "" @@ -61305,7 +61439,7 @@ msgstr "" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "" -#: erpnext/controllers/stock_controller.py:784 +#: erpnext/controllers/stock_controller.py:789 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "" @@ -61354,8 +61488,8 @@ msgstr "" msgid "{0}'s {1} cannot be after {2}'s Expected End Date." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1140 #: erpnext/manufacturing/doctype/job_card/job_card.py:1148 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1156 msgid "{0}, complete the operation {1} before the operation {2}." msgstr "" @@ -61371,23 +61505,23 @@ msgstr "" msgid "{0}: {1} must be less than {2}" msgstr "" -#: erpnext/controllers/buying_controller.py:902 +#: erpnext/controllers/buying_controller.py:890 msgid "{count} Assets created for {item_code}" msgstr "" -#: erpnext/controllers/buying_controller.py:800 +#: erpnext/controllers/buying_controller.py:788 msgid "{doctype} {name} is cancelled or closed." msgstr "" -#: erpnext/controllers/buying_controller.py:521 +#: erpnext/controllers/buying_controller.py:509 msgid "{field_label} is mandatory for sub-contracted {doctype}." msgstr "" -#: erpnext/controllers/stock_controller.py:1647 +#: erpnext/controllers/stock_controller.py:1737 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" -#: erpnext/controllers/buying_controller.py:625 +#: erpnext/controllers/buying_controller.py:613 msgid "{ref_doctype} {ref_name} is {status}." msgstr "" From 8289dc6885db5e1e5ea8fe75dcdcfcdfcdaee3b8 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Thu, 19 Jun 2025 11:32:29 +0530 Subject: [PATCH 7/7] chore: activate dormant test case in payment request --- .../payment_request/test_payment_request.py | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/test_payment_request.py b/erpnext/accounts/doctype/payment_request/test_payment_request.py index c57e047b96b..cd50a4efc50 100644 --- a/erpnext/accounts/doctype/payment_request/test_payment_request.py +++ b/erpnext/accounts/doctype/payment_request/test_payment_request.py @@ -788,29 +788,28 @@ class TestPaymentRequest(IntegrationTestCase): pr = make_payment_request(dt="Sales Invoice", dn=si.name, mute_email=1) self.assertEqual(pr.grand_total, si.outstanding_amount) + def test_partial_paid_invoice_with_submitted_payment_entry(self): + pi = make_purchase_invoice(currency="INR", qty=1, rate=5000) + pi.save() + pi.submit() -def test_partial_paid_invoice_with_submitted_payment_entry(self): - pi = make_purchase_invoice(currency="INR", qty=1, rate=5000) - pi.save() - pi.submit() + pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC") + pe.reference_no = "PURINV0001" + pe.reference_date = frappe.utils.nowdate() + pe.paid_amount = 2500 + pe.references[0].allocated_amount = 2500 + pe.save() + pe.submit() + pe.cancel() - pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC") - pe.reference_no = "PURINV0001" - pe.reference_date = frappe.utils.nowdate() - pe.paid_amount = 2500 - pe.references[0].allocated_amount = 2500 - pe.save() - pe.submit() - pe.cancel() + pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC") + pe.reference_no = "PURINV0002" + pe.reference_date = frappe.utils.nowdate() + pe.paid_amount = 2500 + pe.references[0].allocated_amount = 2500 + pe.save() + pe.submit() - pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC") - pe.reference_no = "PURINV0002" - pe.reference_date = frappe.utils.nowdate() - pe.paid_amount = 2500 - pe.references[0].allocated_amount = 2500 - pe.save() - pe.submit() - - pi.load_from_db() - pr = make_payment_request(dt="Purchase Invoice", dn=pi.name, mute_email=1) - self.assertEqual(pr.grand_total, pi.outstanding_amount) + pi.load_from_db() + pr = make_payment_request(dt="Purchase Invoice", dn=pi.name, mute_email=1) + self.assertEqual(pr.grand_total, pi.outstanding_amount)